Skip to content

Commit dbd0a2a

Browse files
committed
[SPARK-28511][INFRA] Get REV from RELEASE_VERSION instead of VERSION
## What changes were proposed in this pull request? Unlike the other versions, `x.x.0-SNAPSHOT` causes `x.x.-1`. Although this will not happen in the tags (there is no `SNAPSHOT` postfix), we had better fix this. ``` $ dev/create-release/do-release-docker.sh -d /tmp/spark-3.0.0 -n Output directory already exists. Overwrite and continue? [y/n] y Branch [branch-2.4]: master Current branch version is 3.0.0-SNAPSHOT. Release [3.0.-1]: ``` Since we already have `RELEASE_VERSION` by removing `SNAPSHOT`. This PR uses `RELEASE_VERSION` instead of `VERSION`. ``` $ dev/create-release/do-release-docker.sh -d /tmp/spark-3.0.0 -n Branch [branch-2.4]: master Current branch version is 3.0.0-SNAPSHOT. Release [3.0.0]: ``` ## How was this patch tested? Manually do `dev/create-release/do-release-docker.sh -d /tmp/spark-3.0.0 -n` and see the default value of `Release`. Closes #25254 from dongjoon-hyun/SPARK-28511. Authored-by: Dongjoon Hyun <dhyun@apple.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
1 parent 89fd2b5 commit dbd0a2a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

dev/create-release/release-util.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ function get_release_info {
102102
NEXT_VERSION="$VERSION"
103103
RELEASE_VERSION="${VERSION/-SNAPSHOT/}"
104104
SHORT_VERSION=$(echo "$VERSION" | cut -d . -f 1-2)
105-
local REV=$(echo "$VERSION" | cut -d . -f 3)
105+
local REV=$(echo "$RELEASE_VERSION" | cut -d . -f 3)
106106

107107
# Find out what rc is being prepared.
108108
# - If the current version is "x.y.0", then this is rc1 of the "x.y.0" release.

0 commit comments

Comments
 (0)