From adf997784020e501c618dbe55b47a365380a06df Mon Sep 17 00:00:00 2001 From: Yuming Wang Date: Mon, 16 Dec 2019 16:15:13 +0800 Subject: [PATCH 1/2] Fix --- dev/create-release/release-tag.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/create-release/release-tag.sh b/dev/create-release/release-tag.sh index f8b730b06136..575c3e10a2be 100755 --- a/dev/create-release/release-tag.sh +++ b/dev/create-release/release-tag.sh @@ -74,7 +74,9 @@ git config user.email $GIT_EMAIL # Create release version $MVN versions:set -DnewVersion=$RELEASE_VERSION | grep -v "no value" # silence logs # Set the release version in R/pkg/DESCRIPTION -sed -i".tmp1" 's/Version.*$/Version: '"$RELEASE_VERSION"'/g' R/pkg/DESCRIPTION +if [[ $RELEASE_VERSION != *"preview"* ]]; then + sed -i".tmp1" 's/Version.*$/Version: '"$RELEASE_VERSION"'/g' R/pkg/DESCRIPTION +fi # Set the release version in docs sed -i".tmp1" 's/SPARK_VERSION:.*$/SPARK_VERSION: '"$RELEASE_VERSION"'/g' docs/_config.yml sed -i".tmp2" 's/SPARK_VERSION_SHORT:.*$/SPARK_VERSION_SHORT: '"$RELEASE_VERSION"'/g' docs/_config.yml From 9aa5e4521aedeeee295314fb69bf7f04f79e6730 Mon Sep 17 00:00:00 2001 From: Yuming Wang Date: Mon, 16 Dec 2019 16:56:11 +0800 Subject: [PATCH 2/2] Update the sparkR version number check logic to allow jvm version like `3.0.0-preview` --- dev/create-release/release-tag.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/create-release/release-tag.sh b/dev/create-release/release-tag.sh index 575c3e10a2be..39856a995595 100755 --- a/dev/create-release/release-tag.sh +++ b/dev/create-release/release-tag.sh @@ -73,9 +73,11 @@ git config user.email $GIT_EMAIL # Create release version $MVN versions:set -DnewVersion=$RELEASE_VERSION | grep -v "no value" # silence logs -# Set the release version in R/pkg/DESCRIPTION if [[ $RELEASE_VERSION != *"preview"* ]]; then + # Set the release version in R/pkg/DESCRIPTION sed -i".tmp1" 's/Version.*$/Version: '"$RELEASE_VERSION"'/g' R/pkg/DESCRIPTION +else + sed -i".tmp1" 's/-SNAPSHOT/'"-$(cut -d "-" -f 2 <<< $RELEASE_VERSION)"'/g' R/pkg/R/sparkR.R fi # Set the release version in docs sed -i".tmp1" 's/SPARK_VERSION:.*$/SPARK_VERSION: '"$RELEASE_VERSION"'/g' docs/_config.yml