You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by he...@apache.org on 2021/04/29 19:56:50 UTC
[beam] branch master updated: bugfix for cut_release_branch.sh
This is an automated email from the ASF dual-hosted git repository.
heejong 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 17fef39 bugfix for cut_release_branch.sh
new a2849e0 Merge pull request #14682 from ihji/bugfix_cut_release_branch_script
17fef39 is described below
commit 17fef39613e15165acf70ebb322673d69e1d4b7d
Author: Heejong Lee <he...@gmail.com>
AuthorDate: Thu Apr 29 00:36:18 2021 -0700
bugfix for cut_release_branch.sh
---
release/src/main/scripts/cut_release_branch.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/release/src/main/scripts/cut_release_branch.sh b/release/src/main/scripts/cut_release_branch.sh
index 221d8fa..0a2b025 100755
--- a/release/src/main/scripts/cut_release_branch.sh
+++ b/release/src/main/scripts/cut_release_branch.sh
@@ -55,7 +55,8 @@ if [[ -z "$RELEASE" || -z "$NEXT_VERSION_IN_BASE_BRANCH" ]]; then
exit
fi
-SCRIPT_DIR=$(dirname $0)
+SCRIPT=$(readlink -f $0)
+SCRIPT_DIR=$(dirname $SCRIPT)
MASTER_BRANCH=master
DEV=${RELEASE}.dev
RELEASE_BRANCH=release-${RELEASE}
@@ -91,7 +92,7 @@ echo ${MASTER_BRANCH}
echo "==============================================================="
# Update master branch
-sh "$SCRIPT_DIR"/set_version.sh "$NEXT_VERSION_IN_BASE_BRANCH""
+sh "$SCRIPT_DIR"/set_version.sh "$NEXT_VERSION_IN_BASE_BRANCH"
echo "==============Update master branch as following================"
git diff