From f94a00f33aa4cd34a85ef38e8a9496c69e1dd90d Mon Sep 17 00:00:00 2001 From: emily Date: Thu, 24 Feb 2022 13:49:06 -0800 Subject: [PATCH] [BEAM-4767] Remove beam- prefix from release script tags (#16899) --- release/src/main/scripts/cut_release_branch.sh | 2 +- release/src/main/scripts/set_version.sh | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/release/src/main/scripts/cut_release_branch.sh b/release/src/main/scripts/cut_release_branch.sh index 1e633934bdce..a7b10530cf4c 100755 --- a/release/src/main/scripts/cut_release_branch.sh +++ b/release/src/main/scripts/cut_release_branch.sh @@ -125,7 +125,7 @@ echo "==================Current working branch=======================" echo ${RELEASE_BRANCH} echo "===============================================================" -sed -i -e "s/'beam-master-.*'/'beam-${RELEASE}'/g" runners/google-cloud-dataflow-java/build.gradle +sed -i -e "s/'beam-master-.*'/'${RELEASE}'/g" runners/google-cloud-dataflow-java/build.gradle echo "===============Update release branch as following==============" git diff diff --git a/release/src/main/scripts/set_version.sh b/release/src/main/scripts/set_version.sh index 67420d6dda96..387dd03d69ac 100755 --- a/release/src/main/scripts/set_version.sh +++ b/release/src/main/scripts/set_version.sh @@ -76,9 +76,6 @@ if [[ -z "$IS_SNAPSHOT_VERSION" ]] ; then sed -i -e "s/^__version__ = .*/__version__ = '${TARGET_VERSION}'/" sdks/python/apache_beam/version.py sed -i -e "s/sdk_version=.*/sdk_version=$TARGET_VERSION/" gradle.properties sed -i -e "s/SdkVersion = .*/SdkVersion = \"$TARGET_VERSION\"/" sdks/go/pkg/beam/core/core.go - # TODO: [BEAM-4767] - sed -i -e "s/'dataflow.fnapi_container_version' : .*/'dataflow.fnapi_container_version' : '${TARGET_VERSION}',/" runners/google-cloud-dataflow-java/build.gradle - sed -i -e "s/'dataflow.legacy_container_version' : .*/'dataflow.legacy_container_version' : 'beam-${TARGET_VERSION}',/" runners/google-cloud-dataflow-java/build.gradle else # For snapshot version: # Java/gradle appends -SNAPSHOT