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:24:21 UTC
[camel-k-runtime] branch main updated: 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-k-runtime.git
The following commit(s) were added to refs/heads/main by this push:
new 9420c8e Moving from master branch to main
9420c8e is described below
commit 9420c8eb0baf73ded361e2179f29e594f1e5d241
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 07:23:33 2021 +0200
Moving from master branch to main
---
.github/workflows/automatic-changelog-update.yml | 6 +++---
.github/workflows/ci-build-camel-master.yaml | 8 ++++----
.github/workflows/ci-build.yml | 6 +++---
.github/workflows/pr-validate.yml | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/automatic-changelog-update.yml b/.github/workflows/automatic-changelog-update.yml
index ce54e9b..c966e86 100644
--- a/.github/workflows/automatic-changelog-update.yml
+++ b/.github/workflows/automatic-changelog-update.yml
@@ -26,8 +26,8 @@ on:
jobs:
generate_changelog:
runs-on: ubuntu-latest
- name: Generate changelog for master branch
- if: github.ref == 'refs/heads/master' && github.repository == 'apache/camel-k-runtime'
+ name: Generate changelog for main branch
+ if: github.ref == 'refs/heads/main' && github.repository == 'apache/camel-k-runtime'
steps:
- name: "Checkout camel-kafka-connector"
uses: actions/checkout@v2
@@ -56,4 +56,4 @@ jobs:
CI_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
CI_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
- git push "https://$CI_USER:$CI_TOKEN@github.com/$GITHUB_REPOSITORY.git" HEAD:master
+ git push "https://$CI_USER:$CI_TOKEN@github.com/$GITHUB_REPOSITORY.git" HEAD:main
diff --git a/.github/workflows/ci-build-camel-master.yaml b/.github/workflows/ci-build-camel-master.yaml
index 9278705..d97bff8 100644
--- a/.github/workflows/ci-build-camel-master.yaml
+++ b/.github/workflows/ci-build-camel-master.yaml
@@ -56,15 +56,15 @@ jobs:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- - name: Build camel (master)
+ - name: Build camel (main)
run: |
- git clone --depth 1 --branch master https://github.com/apache/camel.git \
+ git clone --depth 1 --branch main https://github.com/apache/camel.git \
&& cd camel \
&& echo "Current Camel commit:" $(git rev-parse HEAD) \
&& ./mvnw ${MAVEN_ARGS} clean install -Pfastinstall
- - name: Build camel-quarkus (camel-master)
+ - name: Build camel-quarkus (camel-main)
run: |
- git clone --depth 1 --branch camel-master https://github.com/apache/camel-quarkus.git \
+ git clone --depth 1 --branch camel-main https://github.com/apache/camel-quarkus.git \
&& cd camel-quarkus \
&& echo "Current Camel Quarkus commit:" $(git rev-parse HEAD) \
&& ./mvnw ${MAVEN_ARGS} clean install -Dquickly -s $(pwd)/settings-camel-3.7.0.xml
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index b18e98a..b020083 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -23,7 +23,7 @@ env:
on:
push:
branches:
- - master
+ - main
paths-ignore:
- '**.adoc'
- 'KEYS'
@@ -32,7 +32,7 @@ on:
- 'Jenkinsfile'
pull_request:
branches:
- - master
+ - main
paths-ignore:
- '**.adoc'
- 'KEYS'
@@ -169,7 +169,7 @@ jobs:
needs:
- build-native
- build-native-examples
- 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/pr-validate.yml b/.github/workflows/pr-validate.yml
index b041abc..a743833 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -23,7 +23,7 @@ env:
on:
pull_request:
branches:
- - master
+ - main
paths-ignore:
- '**.adoc'
- 'KEYS'