Skip to content

Commit

Permalink
[CELEBORN-1191] Migrate the release script from Maven to SBT
Browse files Browse the repository at this point in the history
### 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 apache#2178 from cfmcgrady/release-sbt.

Authored-by: Fu Chen <cfmcgrady@gmail.com>
Signed-off-by: Fu Chen <cfmcgrady@gmail.com>
  • Loading branch information
cfmcgrady committed Dec 20, 2023
1 parent 089a0f8 commit eba1efb
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 39 deletions.
48 changes: 12 additions & 36 deletions build/release/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
7 changes: 4 additions & 3 deletions project/CelebornBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ trait SparkClientProjects {
case _ => MergeStrategy.first
},

Compile / packageBin / artifact := (assembly / artifact).value
Compile / packageBin := assembly.value
)
if (includeColumnarShuffle) {
p.dependsOn(sparkColumnarShuffle)
Expand Down Expand Up @@ -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
)
}
}
Expand Down Expand Up @@ -1065,7 +1066,7 @@ object MRClientProjects {
case _ => MergeStrategy.first
},

Compile / packageBin / artifact := (assembly / artifact).value
Compile / packageBin := assembly.value
)
}

Expand Down

0 comments on commit eba1efb

Please sign in to comment.