You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2019/10/04 05:39:33 UTC
[hbase] branch master updated: HBASE-23118 [RELEASE SCRIPTS] Allow
creating a RC from an existing tag[RELEASE SCRIPTS] Allow creating a RC
from an existing tag (#686)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new f08a310 HBASE-23118 [RELEASE SCRIPTS] Allow creating a RC from an existing tag[RELEASE SCRIPTS] Allow creating a RC from an existing tag (#686)
f08a310 is described below
commit f08a310ed905367c533934cb0dea41f6fc5e42e3
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Fri Oct 4 13:39:27 2019 +0800
HBASE-23118 [RELEASE SCRIPTS] Allow creating a RC from an existing tag[RELEASE SCRIPTS] Allow creating a RC from an existing tag (#686)
Signed-off-by: stack <st...@apache.org>
---
dev-support/create-release/do-release.sh | 8 +++++++-
dev-support/create-release/release-util.sh | 12 +++++++-----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/dev-support/create-release/do-release.sh b/dev-support/create-release/do-release.sh
index 58a6d8d..1c10dfc 100755
--- a/dev-support/create-release/do-release.sh
+++ b/dev-support/create-release/do-release.sh
@@ -57,7 +57,13 @@ export GPG_TTY=$(tty)
function should_build {
local WHAT=$1
- [ -z "$RELEASE_STEP" ] || [ "$WHAT" = "$RELEASE_STEP" ]
+ if [[ -z "$RELEASE_STEP" ]]; then
+ return 0
+ elif [[ "$RELEASE_STEP" == *"$WHAT"* ]]; then
+ return 0
+ else
+ return 1
+ fi
}
if should_build "tag" && [ $SKIP_TAG = 0 ]; then
diff --git a/dev-support/create-release/release-util.sh b/dev-support/create-release/release-util.sh
index be862ad..5ccd31a 100755
--- a/dev-support/create-release/release-util.sh
+++ b/dev-support/create-release/release-util.sh
@@ -126,13 +126,15 @@ function get_release_info {
parse_version)
echo "Current branch VERSION is $VERSION."
- if [[ ! $VERSION =~ .*-SNAPSHOT ]]; then
- error "Not a SNAPSHOT version: $VERSION"
- fi
-
NEXT_VERSION="$VERSION"
- RELEASE_VERSION="${VERSION/-SNAPSHOT/}"
+ RELEASE_VERSION=""
SHORT_VERSION=$(echo "$VERSION" | cut -d . -f 1-2)
+ if [[ ! $VERSION =~ .*-SNAPSHOT ]]; then
+ RELEASE_VERSION="$VERSION"
+ else
+ RELEASE_VERSION="${VERSION/-SNAPSHOT/}"
+ fi
+
local REV=$(echo "$VERSION" | cut -d . -f 3)
# Find out what RC is being prepared.