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 branch cut to still update container and snapshot versions to 2.XX.0 #33872

Merged
merged 2 commits into from
Feb 5, 2025
Merged

Update release branch cut to still update container and snapshot versions to 2.XX.0 #33872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
703349e
Update release branch cut to still update container version to 2.XX.0
damccorm Feb 5, 2025
07d0da1
Update a few more spots
damccorm Feb 5, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/cut_release_branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
echo "==============================================================="
- name: Update release version for dataflow runner
run: |
sed -i -e "s/'beam-master-.*'/'${RELEASE}'/g" \
sed -i -e "s/'beam-master-.*'/'${RELEASE}.0'/g" \
runners/google-cloud-dataflow-java/build.gradle
echo "===============Update release branch as following=============="
git diff
Expand Down
5 changes: 5 additions & 0 deletions release/src/main/scripts/set_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ if [[ -z $TARGET_VERSION ]] ; then
exit 1
fi

if ! [[ ${RELEASE} =~ ([0-9]+\.[0-9]+\.[0-9]+) ]];
then echo "The input for RELEASE does not match a valid format [0-9]+\.[0-9]+\.[0-9]+"
exit 1
fi

if [[ -z "$IS_SNAPSHOT_VERSION" ]] ; then
# Fixing a release version
sed -i -e "s/version=.*/version=$TARGET_VERSION/" gradle.properties
Expand Down
2 changes: 1 addition & 1 deletion release/src/main/scripts/verify_release_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
set -e

BEAM_REPO_URL=https://github.com/apache/beam.git
RELEASE_BRANCH=release-${RELEASE_VER}
RELEASE_BRANCH="release-$(cut -d '.' -f 1,2 <<< $RELEASE)"
WORKING_BRANCH=postcommit_validation_pr
SCRIPT=$(readlink -f $0)
SCRIPT_DIR=$(dirname $SCRIPT)
Expand Down
Loading