This is an automated email from the ASF dual-hosted git repository.
jrmccluskey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 905794c9509 Add branch protection rules via .asf.yaml (#27502)
905794c9509 is described below
commit 905794c95094ccf17b272aba08b6d60ebfa68b02
Author: Danny McCormick <[email protected]>
AuthorDate: Fri Jul 14 10:28:32 2023 -0400
Add branch protection rules via .asf.yaml (#27502)
* Add branch protection rules via .asf.yaml
* Fix branch replacement
---
.asf.yaml | 60 ++++++++++++++++++++++++++++++++
.github/workflows/cut_release_branch.yml | 5 +++
2 files changed, 65 insertions(+)
diff --git a/.asf.yaml b/.asf.yaml
index 848391d29d3..defb99e8c37 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -46,6 +46,66 @@ github:
merge: true
rebase: false
+ protected_branches:
+ master: {}
+ release-2.49.0: {}
+ release-2.48.0: {}
+ release-2.47.0: {}
+ release-2.46.0: {}
+ release-2.45.0: {}
+ release-2.44.0: {}
+ release-2.43.0: {}
+ release-2.42.0: {}
+ release-2.41.0: {}
+ release-2.40.0: {}
+ release-2.39.0: {}
+ release-2.38.0: {}
+ release-2.37.0: {}
+ release-2.36.0: {}
+ release-2.35.0: {}
+ release-2.34.0: {}
+ release-2.33.0: {}
+ release-2.32.0: {}
+ release-2.31.0: {}
+ release-2.30.0: {}
+ release-2.29.0: {}
+ release-2.28.0: {}
+ release-2.27.0: {}
+ release-2.26.0: {}
+ release-2.25.0: {}
+ release-2.24.0: {}
+ release-2.23.0: {}
+ release-2.22.0: {}
+ release-2.21.0: {}
+ release-2.20.0: {}
+ release-2.19.0: {}
+ release-2.18.0: {}
+ release-2.17.0: {}
+ release-2.16.0: {}
+ release-2.15.0: {}
+ release-2.14.0: {}
+ release-2.13.0: {}
+ release-2.12.0: {}
+ release-2.11.0: {}
+ release-2.10.0: {}
+ release-2.8.0: {}
+ release-2.8.0: {}
+ release-2.7.0: {}
+ release-2.6.0: {}
+ release-2.5.0: {}
+ release-2.4.0: {}
+ release-2.3.0: {}
+ release-2.2.0: {}
+ release-2.1.1: {}
+ release-2.1.0: {}
+ release-0.6.0: {}
+ release-0.5.0: {}
+ release-0.4.0: {}
+ release-0.4.0-incubating: {}
+ release-0.3.0-incubating: {}
+ release-0.2.0-incubating: {}
+ release-0.1.0-incubating: {}
+
notifications:
commits: [email protected]
issues: [email protected]
diff --git a/.github/workflows/cut_release_branch.yml
b/.github/workflows/cut_release_branch.yml
index f026c41ca9c..e631fd6111b 100644
--- a/.github/workflows/cut_release_branch.yml
+++ b/.github/workflows/cut_release_branch.yml
@@ -100,6 +100,7 @@ jobs:
MASTER_BRANCH: master
NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }}
SCRIPT_DIR: ./release/src/main/scripts
+ RELEASE: ${{ github.event.inputs.RELEASE_VERSION }}
steps:
- name: Mask Jenkins token
run: |
@@ -150,6 +151,9 @@ jobs:
env:
JENKINS_USERNAME: ${{ github.event.inputs.JENKINS_USERNAME }}
JENKINS_TOKEN: ${{ github.event.inputs.JENKINS_TOKEN }}
+ - name: Update .asf.yaml to protect new release branch from force push
+ run: |
+ sed -i -e "s/master: {}/master: {}\n release-${RELEASE}: {}/g"
.asf.yaml
- name: Update master branch
run: |
bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}"
@@ -159,6 +163,7 @@ jobs:
- name: Commit and Push to master branch files with Next Version
run: |
git add *
+ git add .asf.yaml
git commit -m "Moving to ${NEXT_VERSION_IN_BASE_BRANCH}-SNAPSHOT on
master branch."
git push origin ${MASTER_BRANCH}
