You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/04/21 05:18:23 UTC

[camel-spring-boot] 01/02: Moving from master branch to main

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 8b92571bc07bbb9e0cd5d44cf5919907be7138b4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 07:17:16 2021 +0200

    Moving from master branch to main
---
 .github/workflows/asf-snapshots-deploy.yml  |  2 +-
 .github/workflows/automatic-sync-master.yml | 14 +++++++-------
 Jenkinsfile.sb.deploy                       |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/asf-snapshots-deploy.yml b/.github/workflows/asf-snapshots-deploy.yml
index 2e30cdf..eee9796 100644
--- a/.github/workflows/asf-snapshots-deploy.yml
+++ b/.github/workflows/asf-snapshots-deploy.yml
@@ -46,7 +46,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     needs: build
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     env:
       NEXUS_DEPLOY_USERNAME: ${{ secrets.NEXUS_USER }}
       NEXUS_DEPLOY_PASSWORD: ${{ secrets.NEXUS_PW }}
diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml
index bb7ab10..ba43de7 100644
--- a/.github/workflows/automatic-sync-master.yml
+++ b/.github/workflows/automatic-sync-master.yml
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-name: Sync Camel Spring Boot Master Branch
+name: Sync Camel Spring Boot Main Branch
 
 on:
   schedule:
@@ -23,7 +23,7 @@ on:
     - cron:  '0 0 * * *'
 jobs:
   build:
-    name: Sync Camel Spring Boot Master Branch
+    name: Sync Camel Spring Boot Main Branch
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Camel project
@@ -31,7 +31,7 @@ jobs:
         with:
           repository: apache/camel
           persist-credentials: false
-          ref: master
+          ref: main
           path: camel
       - name: Set Up Java
         uses: actions/setup-java@v1
@@ -43,7 +43,7 @@ jobs:
       - name: Checkout Camel-spring-boot project
         uses: actions/checkout@v2
         with:
-          ref: master
+          ref: main
           persist-credentials: false
           fetch-depth: 0
       - name: Build Camel-spring-boot Project
@@ -53,7 +53,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: automatic-periodic-sync
-          title: '[Github Actions] Periodic Sync Camel Spring Boot Master Branch'
+          title: '[Github Actions] Periodic Sync Camel Spring Boot Main Branch'
           body: |
-            Periodic Sync of Camel Spring Boot Master Branch with main Camel Master.
-            see https://github.com/apache/camel-spring-boot/blob/master/.github/workflows/automatic-sync-master.yml
+            Periodic Sync of Camel Spring Boot Main Branch with main Camel Main.
+            see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml
diff --git a/Jenkinsfile.sb.deploy b/Jenkinsfile.sb.deploy
index 6c1fa0b..0bf8bcc 100644
--- a/Jenkinsfile.sb.deploy
+++ b/Jenkinsfile.sb.deploy
@@ -54,7 +54,7 @@ pipeline {
 
         stage('Build & Deploy') {
             when {
-                branch 'master'
+                branch 'main'
             }
             steps {
                 sh "./mvnw $MAVEN_PARAMS -Pdeploy -Dmaven.test.skip.exec=true clean deploy"