Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update release finalization to push postrelease branch #33467

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update release finalization to push postrelease branch #33467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cf2589
Update release finalization to push postrelease branch
damccorm Dec 30, 2024
286251f
Update republish_released_docker_containers.yml
damccorm Dec 30, 2024
641f7aa
Protect newly created branch
damccorm Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/workflows/finalize_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ jobs:
env:
VERSION_TAG: "v${{ github.event.inputs.RELEASE }}"
RC_TAG: "v${{ github.event.inputs.RELEASE }}-RC${{ github.event.inputs.RC }}"
POST_RELEASE_BRANCH: "release-${{ github.event.inputs.RELEASE }}-postrelease"
run: |
# Ensure local tags are in sync. If there's a mismatch, it will tell you.
git fetch --all --tags --prune
Expand All @@ -152,3 +153,27 @@ jobs:
# Tag for repo root.
git tag "$VERSION_TAG" "$RC_TAG" -m "Tagging release" --local-user="${{steps.import_gpg.outputs.name}}"
git push https://github.com/apache/beam "$VERSION_TAG"

git checkout -b "$POST_RELEASE_BRANCH" "$VERSION_TAG"
git push https://github.com/apache/beam "$POST_RELEASE_BRANCH"

update_master:
needs: push_git_tags
runs-on: ubuntu-latest
env:
POST_RELEASE_BRANCH: "release-${{ github.event.inputs.RELEASE }}-postrelease"
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Set git config
run: |
git config user.name $GITHUB_ACTOR
git config user.email actions@"$RUNNER_NAME".local
- name: Update .asf.yaml to protect new postrelease branch from force push
run: |
sed -i -e "s/master: {}/master: {}\n ${POST_RELEASE_BRANCH}: {}/g" .asf.yaml
- name: Commit and Push to master branch files with Next Version
run: |
git add .asf.yaml
git commit -m "Moving to ${NEXT_VERSION_IN_BASE_BRANCH}-SNAPSHOT on master branch."
git push origin ${MASTER_BRANCH}
2 changes: 1 addition & 1 deletion .github/workflows/republish_released_docker_containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
ref: "v${{ env.release }}-RC${{ env.rc }}"
ref: "release-${{ env.release }}-postrelease"
repository: apache/beam
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/[email protected]
Expand Down
Loading