This is an automated email from the ASF dual-hosted git repository. yhu pushed a commit to branch revert-34518-add-rc00-tag in repository https://gitbox.apache.org/repos/asf/beam.git
commit f086aed9bdc7c7acfc02042ee0b7f9c1d4f38673 Author: Yi Hu <[email protected]> AuthorDate: Wed Apr 2 14:25:45 2025 -0400 Revert "Add rc00 tag (#34518)" This reverts commit 8abd8a02018e5232b4f4537e7a279b24b4122caf. --- .github/workflows/cut_release_branch.yml | 6 +----- release/src/main/scripts/set_version.sh | 12 +----------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml index 43d50f18e61..48dbd68817f 100644 --- a/.github/workflows/cut_release_branch.yml +++ b/.github/workflows/cut_release_branch.yml @@ -56,7 +56,6 @@ jobs: if [[ ${RELEASE} =~ ([0-9]+\.[0-9]+) ]]; then echo "RELEASE_VERSION=${BASH_REMATCH[1]}" >> $GITHUB_ENV echo "RELEASE_BRANCH=release-${RELEASE}" >> $GITHUB_ENV - echo "RELEASE_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}.0" >> $GITHUB_ENV else echo "The input for RELEASE does not match a valid format [0-9]+\.[0-9]+" exit 1 @@ -98,7 +97,6 @@ jobs: steps: - name: Validate Next Version run: | - echo "RELEASE_CUT_TAG=v${RELEASE_VERSION_IN_BASE_BRANCH}-RC00" >> $GITHUB_ENV if [[ $NEXT_RELEASE =~ ([0-9]+\.[0-9]+) ]]; then echo "NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}.0" >> $GITHUB_ENV else @@ -118,9 +116,7 @@ jobs: 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}" "--add-tag" "${RELEASE_CUT_TAG}" - echo "==============tag RC00 to current master branch================" - git push origin tag "${RELEASE_CUT_TAG}" + bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}" echo "==============Update master branch as following================" git diff echo "===============================================================" diff --git a/release/src/main/scripts/set_version.sh b/release/src/main/scripts/set_version.sh index 7314ff54497..082786c5946 100755 --- a/release/src/main/scripts/set_version.sh +++ b/release/src/main/scripts/set_version.sh @@ -25,7 +25,7 @@ set -e function usage() { - echo 'Usage: set_version.sh <version> [--release] [--debug] [--git-add] [--add-tag]' + echo 'Usage: set_version.sh <version> [--release] [--debug] [--git-add]' } IS_SNAPSHOT_VERSION=yes @@ -50,11 +50,6 @@ while [[ $# -gt 0 ]] ; do shift ;; - --add-tag) - shift - ADD_TAG="$1" - shift - ;; *) if [[ -z "$TARGET_VERSION" ]] ; then TARGET_VERSION="$1" @@ -79,11 +74,6 @@ if ! [[ ${TARGET_VERSION} =~ ([0-9]+\.[0-9]+\.[0-9]+) ]]; exit 1 fi -if [[ -n $ADD_TAG ]] ; then - git tag -a "$ADD_TAG" - -fi - if [[ -z "$IS_SNAPSHOT_VERSION" ]] ; then # Fixing a release version sed -i -e "s/version=.*/version=$TARGET_VERSION/" gradle.properties
