You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2023/05/19 20:08:45 UTC
[beam] 01/01: Gate pushing to master on input (default true)
This is an automated email from the ASF dual-hosted git repository.
damccorm pushed a commit to branch users/damccorm/master-gate
in repository https://gitbox.apache.org/repos/asf/beam.git
commit 8ea3be73a107a7e31ee6deea72dab8baace56341
Author: Danny McCormick <da...@google.com>
AuthorDate: Fri May 19 16:08:34 2023 -0400
Gate pushing to master on input (default true)
---
.github/workflows/cut_release_branch.yml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml
index ae3891ff242..98bd6367a48 100644
--- a/.github/workflows/cut_release_branch.yml
+++ b/.github/workflows/cut_release_branch.yml
@@ -43,6 +43,10 @@ on:
JENKINS_TOKEN:
description: API Token for the current Jenkins user. Can be generated at https://ci-beam.apache.org/user/<user>/configure
required: true
+ UPDATE_MASTER:
+ description: Whether to push the master branch to the next release. You shouldnt skip this unless it has already been completed successfully (yes/no)
+ required: true
+ default: 'yes'
permissions:
contents: write
@@ -71,12 +75,15 @@ jobs:
fi
- name: Check out code
uses: actions/checkout@v3
+ if: ${{github.event.inputs.UPDATE_MASTER == 'yes'}}
- name: Set git config
run: |
git config user.name $GITHUB_ACTOR
git config user.email actions@"$RUNNER_NAME".local
+ if: ${{github.event.inputs.UPDATE_MASTER == 'yes'}}
- name: Install xmllint
run: sudo apt-get install -y libxml2-utils
+ if: ${{github.event.inputs.UPDATE_MASTER == 'yes'}}
- name: Update mass_comment.py with new Jenkins jobs
run: |
rm release/src/main/scripts/jenkins_jobs.txt
@@ -105,17 +112,20 @@ jobs:
env:
JENKINS_USERNAME: ${{ github.event.inputs.JENKINS_USERNAME }}
JENKINS_TOKEN: ${{ github.event.inputs.JENKINS_TOKEN }}
+ if: ${{github.event.inputs.UPDATE_MASTER == 'yes'}}
- name: Update master branch
run: |
bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}"
echo "==============Update master branch as following================"
git diff
echo "==============================================================="
+ if: ${{github.event.inputs.UPDATE_MASTER == 'yes'}}
- name: Commit and Push to master branch files with Next Version
run: |
git add *
git commit -m "Moving to ${NEXT_VERSION_IN_BASE_BRANCH}-SNAPSHOT on master branch."
git push origin ${MASTER_BRANCH}
+ if: ${{github.event.inputs.UPDATE_MASTER == 'yes'}}
update_release_branch:
needs: update_master