This is an automated email from the ASF dual-hosted git repository.
fchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new eba1efbb0 [CELEBORN-1191] Migrate the release script from Maven to SBT
eba1efbb0 is described below
commit eba1efbb04e4be1ee285e7b55e3681400e1fc76f
Author: Fu Chen <[email protected]>
AuthorDate: Wed Dec 20 20:20:33 2023 +0800
[CELEBORN-1191] Migrate the release script from Maven to SBT
### What changes were proposed in this pull request?
1. migrated the release script from Maven to SBT.
2. new clients added for publishing
- `celeborn-client-spark-3-shaded_2.13`
- `celeborn-client-mr-shaded_2.12`
### Why are the changes needed?
As title
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Pass GA
Closes #2178 from cfmcgrady/release-sbt.
Authored-by: Fu Chen <[email protected]>
Signed-off-by: Fu Chen <[email protected]>
---
build/release/release.sh | 48 ++++++++++++---------------------------------
project/CelebornBuild.scala | 7 ++++---
2 files changed, 16 insertions(+), 39 deletions(-)
diff --git a/build/release/release.sh b/build/release/release.sh
index a87d2d31c..a02752aaa 100755
--- a/build/release/release.sh
+++ b/build/release/release.sh
@@ -98,52 +98,28 @@ upload_svn_staging() {
upload_nexus_staging() {
echo "Deploying celeborn-client-spark-2-shaded_2.11"
- ${PROJECT_DIR}/build/mvn clean install -DskipTests
-Papache-release,spark-2.4 \
- -s "${PROJECT_DIR}/build/release/asf-settings.xml" \
- -pl :celeborn-client-spark-2-shaded_2.11 -am
- ${PROJECT_DIR}/build/mvn deploy -DskipTests -Papache-release,spark-2.4 \
- -s "${PROJECT_DIR}/build/release/asf-settings.xml" \
- -pl :celeborn-client-spark-2-shaded_2.11
+ ${PROJECT_DIR}/build/sbt -Pspark-2.4
"clean;celeborn-client-spark-2-shaded/publish"
echo "Deploying celeborn-client-spark-3-shaded_2.12"
- ${PROJECT_DIR}/build/mvn clean install -DskipTests
-Papache-release,spark-3.3 \
- -s "${PROJECT_DIR}/build/release/asf-settings.xml" \
- -pl :celeborn-client-spark-3-shaded_2.12 -am
- ${PROJECT_DIR}/build/mvn deploy -DskipTests -Papache-release,spark-3.3 \
- -s "${PROJECT_DIR}/build/release/asf-settings.xml" \
- -pl :celeborn-client-spark-3-shaded_2.12
+ ${PROJECT_DIR}/build/sbt -Pspark-3.4
"clean;celeborn-client-spark-3-shaded/publish"
+
+ echo "Deploying celeborn-client-spark-3-shaded_2.13"
+ ${PROJECT_DIR}/build/sbt -Pspark-3.4 ++2.13
"clean;celeborn-client-spark-3-shaded/publish"
echo "Deploying celeborn-client-flink-1.14-shaded_2.12"
- ${PROJECT_DIR}/build/mvn clean install -DskipTests
-Papache-release,flink-1.14 \
- -s "${PROJECT_DIR}/build/release/asf-settings.xml" \
- -pl :celeborn-client-flink-1.14-shaded_2.12 -am
- ${PROJECT_DIR}/build/mvn deploy -DskipTests -Papache-release,flink-1.14 \
- -s "${PROJECT_DIR}/build/release/asf-settings.xml" \
- -pl :celeborn-client-flink-1.14-shaded_2.12
+ ${PROJECT_DIR}/build/sbt -Pflink-1.14
"clean;celeborn-client-flink-1_14-shaded/publish"
echo "Deploying celeborn-client-flink-1.15-shaded_2.12"
- ${PROJECT_DIR}/build/mvn clean install -DskipTests
-Papache-release,flink-1.15 \
- -s "${PROJECT_DIR}/build/release/asf-settings.xml" \
- -pl :celeborn-client-flink-1.15-shaded_2.12 -am
- ${PROJECT_DIR}/build/mvn deploy -DskipTests -Papache-release,flink-1.15 \
- -s "${PROJECT_DIR}/build/release/asf-settings.xml" \
- -pl :celeborn-client-flink-1.15-shaded_2.12
+ ${PROJECT_DIR}/build/sbt -Pflink-1.15
"clean;celeborn-client-flink-1_15-shaded/publish"
echo "Deploying celeborn-client-flink-1.17-shaded_2.12"
- ${PROJECT_DIR}/build/mvn clean install -DskipTests
-Papache-release,flink-1.17 \
- -s "${PROJECT_DIR}/build/release/asf-settings.xml" \
- -pl :celeborn-client-flink-1.17-shaded_2.12 -am
- ${PROJECT_DIR}/build/mvn deploy -DskipTests -Papache-release,flink-1.17 \
- -s "${PROJECT_DIR}/build/release/asf-settings.xml" \
- -pl :celeborn-client-flink-1.17-shaded_2.12
+ ${PROJECT_DIR}/build/sbt -Pflink-1.17
"clean;celeborn-client-flink-1_17-shaded/publish"
echo "Deploying celeborn-client-flink-1.18-shaded_2.12"
- ${PROJECT_DIR}/build/mvn clean install -DskipTests
-Papache-release,flink-1.18 \
- -s "${PROJECT_DIR}/build/release/asf-settings.xml" \
- -pl :celeborn-client-flink-1.18-shaded_2.12 -am
- ${PROJECT_DIR}/build/mvn deploy -DskipTests -Papache-release,flink-1.18 \
- -s "${PROJECT_DIR}/build/release/asf-settings.xml" \
- -pl :celeborn-client-flink-1.18-shaded_2.12
+ ${PROJECT_DIR}/build/sbt -Pflink-1.18
"clean;celeborn-client-flink-1_18-shaded/publish"
+
+ echo "Deploying celeborn-client-mr-shaded_2.12"
+ ${PROJECT_DIR}/build/sbt -Pmr "clean;celeborn-client-mr-shaded/publish"
}
finalize_svn() {
diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala
index d7b06a036..10c1a505a 100644
--- a/project/CelebornBuild.scala
+++ b/project/CelebornBuild.scala
@@ -765,7 +765,7 @@ trait SparkClientProjects {
case _ => MergeStrategy.first
},
- Compile / packageBin / artifact := (assembly / artifact).value
+ Compile / packageBin := assembly.value
)
if (includeColumnarShuffle) {
p.dependsOn(sparkColumnarShuffle)
@@ -961,7 +961,8 @@ trait FlinkClientProjects {
case "META-INF/native/libnetty_transport_native_epoll_aarch_64.so"
=> CustomMergeStrategy.rename( _ =>
"META-INF/native/liborg_apache_celeborn_shaded_netty_transport_native_epoll_aarch_64.so"
)
case _ => MergeStrategy.first
},
- Compile / packageBin / artifact := (assembly / artifact).value
+
+ Compile / packageBin := assembly.value
)
}
}
@@ -1065,7 +1066,7 @@ object MRClientProjects {
case _ => MergeStrategy.first
},
- Compile / packageBin / artifact := (assembly / artifact).value
+ Compile / packageBin := assembly.value
)
}
