Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-24160 create-release fails to process x.y.0 version info correctly 

Current code gives me the following; notice default values generated
for `RELEASE_VERSION` and `api_diff_tag`.

```
GIT_BRANCH [branch-2.3]:
Current branch VERSION is 2.3.0-SNAPSHOT.
RELEASE_VERSION [2.3.-1]: 2.3.0
NEXT_VERSION [2.3.0-SNAPSHOT]: 2.3.1-SNAPSHOT
RC_COUNT [0]:
GIT_REF [2.3.0RC0]:
api_diff_tag, [rel/2.2.0)]:
```

With this patch I get

```
GIT_BRANCH [branch-2.3]:
Current branch VERSION is 2.3.0-SNAPSHOT.
RELEASE_VERSION [2.3.0]:
NEXT_VERSION [2.3.1-SNAPSHOT]:
RC_COUNT [0]:
GIT_REF [2.3.0RC0]:
api_diff_tag, [rel/2.2.0]:
```

Signed-off-by: Michael Stack <stack@apache.org>
Signed-off-by: Jan Hentschel <jan.hentschel@ultratendency.com>
This commit is contained in:
Nick Dimiduk 2020-04-09 15:04:51 -07:00 committed by Nick Dimiduk
parent 09d20fb4d7
commit b3488fcdec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev-support/create-release/release-util.sh
View File

@ -19,7 +19,7 @@
DRY_RUN=${DRY_RUN:-0} DRY_RUN=${DRY_RUN:-0}
GPG="gpg --pinentry-mode loopback --no-tty --batch" GPG="gpg --pinentry-mode loopback --no-tty --batch"
YETUS_VERSION=${YETUS_VERSION:-0.11.1} YETUS_VERSION=${YETUS_VERSION:-0.11.1}
set -x set -e
function error { function error {
echo "$*" echo "$*"
@ -87,9 +87,9 @@ function get_api_diff_version {
local major=$(echo "$version" | cut -d . -f 1) local major=$(echo "$version" | cut -d . -f 1)
local minor=$(echo "$version" | cut -d . -f 2) local minor=$(echo "$version" | cut -d . -f 2)
if [ $minor != 0 ]; then if [ $minor != 0 ]; then
api_diff_tag="rel/${major}.$((minor - 1)).0)" api_diff_tag="rel/${major}.$((minor - 1)).0"
else else
api_diff_tag="rel/$((major - 1)).0.0)" api_diff_tag="rel/$((major - 1)).0.0"
fi fi
fi fi
api_diff_tag=$(read_config "api_diff_tag", "$api_diff_tag") api_diff_tag=$(read_config "api_diff_tag", "$api_diff_tag")
@ -136,7 +136,7 @@ function get_release_info {
RELEASE_VERSION="${VERSION/-SNAPSHOT/}" RELEASE_VERSION="${VERSION/-SNAPSHOT/}"
fi fi
local REV=$(echo "$VERSION" | cut -d . -f 3) local REV=$(echo "${RELEASE_VERSION}" | cut -d . -f 3)
# Find out what RC is being prepared. # Find out what RC is being prepared.
# - If the current version is "x.y.0", then this is RC0 of the "x.y.0" release. # - If the current version is "x.y.0", then this is RC0 of the "x.y.0" release.