This is an automated email from the ASF dual-hosted git repository.
fchen pushed a commit to branch branch-0.4
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/branch-0.4 by this push:
new 790056073 [CELEBORN-1191][FOLLOWUP] Migrate the release script from
Maven to SBT
790056073 is described below
commit 790056073e0f139fd42b7c080c2d8b5584ab82ab
Author: Fu Chen <[email protected]>
AuthorDate: Wed Dec 20 23:31:55 2023 +0800
[CELEBORN-1191][FOLLOWUP] Migrate the release script from Maven to SBT
### What changes were proposed in this pull request?
As title
### Why are the changes needed?
1. extract `RELEASE_VERSION` from version.sbt instead of pom.xml
2. enable sbt when making binary distribution package
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Pass GA
Closes #2179 from cfmcgrady/celeborn-1191-followup.
Authored-by: Fu Chen <[email protected]>
Signed-off-by: Fu Chen <[email protected]>
(cherry picked from commit 8a34c376cb4cbaaf0679f2c59288015c70107a73)
Signed-off-by: Fu Chen <[email protected]>
---
build/release/create-package.sh | 6 ++----
build/release/release.sh | 4 +---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/build/release/create-package.sh b/build/release/create-package.sh
index 9b407155a..d6a4ba4e8 100755
--- a/build/release/create-package.sh
+++ b/build/release/create-package.sh
@@ -42,9 +42,7 @@ EOF
PROJECT_DIR="$(cd "$(dirname "$0")"/../..; pwd)"
RELEASE_DIR="${PROJECT_DIR}/tmp"
-RELEASE_VERSION=$(grep '<project.version>.*</project.version>'
"${PROJECT_DIR}/pom.xml" -o \
- | head -n 1 \
- | sed 's/<\/*project.version>//g')
+RELEASE_VERSION=$(awk -F'"' '/ThisBuild \/ version/ {print $2}' version.sbt)
SHASUM="sha512sum"
if [ "$(uname)" == "Darwin" ]; then
@@ -77,7 +75,7 @@ package_binary() {
echo "Creating binary release tarball ${BIN_TGZ_FILE}"
- ${PROJECT_DIR}/build/make-distribution.sh --release
+ ${PROJECT_DIR}/build/make-distribution.sh --sbt-enabled --release
cp "${BIN_TGZ_FILE}" "${RELEASE_DIR}"
diff --git a/build/release/release.sh b/build/release/release.sh
index a02752aaa..d1dc5af87 100755
--- a/build/release/release.sh
+++ b/build/release/release.sh
@@ -27,9 +27,7 @@ ASF_USERNAME=${ASF_USERNAME:?"ASF_USERNAME is required"}
ASF_PASSWORD=${ASF_PASSWORD:?"ASF_PASSWORD is required"}
RELEASE_RC_NO=${RELEASE_RC_NO:?"RELEASE_RC_NO is required, e.g. 0"}
-RELEASE_VERSION=$(grep '<project.version>.*</project.version>'
"${PROJECT_DIR}/pom.xml" -o \
- | head -n 1 \
- | sed 's/<\/*project.version>//g')
+RELEASE_VERSION=$(awk -F'"' '/ThisBuild \/ version/ {print $2}' version.sbt)
exit_with_usage() {
local NAME=$(basename $0)