This is an automated email from the ASF dual-hosted git repository.
ethanfeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new 879f8cdd6 [CELEBORN-1559] Fix make distribution script failed to
recognize specific profile
879f8cdd6 is described below
commit 879f8cdd652702452579795348d6027d9de348bc
Author: zhaohehuhu <[email protected]>
AuthorDate: Thu Aug 15 19:46:51 2024 +0800
[CELEBORN-1559] Fix make distribution script failed to recognize specific
profile
<!--
Thanks for sending a pull request! Here are some tips for you:
- Make sure the PR title start w/ a JIRA ticket, e.g. '[CELEBORN-XXXX]
Your PR title ...'.
- Be sure to keep the PR description updated to reflect all changes.
- Please write your PR title to summarize what this PR proposes.
- If possible, provide a concise example to reproduce the issue for a
faster review.
-->
### What changes were proposed in this pull request?
as title
### Why are the changes needed?
When I run the command(./build/make-distribution.sh -Pflink-1.16), the
profiles can be resolved and built.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Yes
Closes #2682 from zhaohehuhu/dev-0814.
Authored-by: zhaohehuhu <[email protected]>
Signed-off-by: mingji <[email protected]>
---
build/make-distribution.sh | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/build/make-distribution.sh b/build/make-distribution.sh
index 6f454d2c8..2f0c9aa29 100755
--- a/build/make-distribution.sh
+++ b/build/make-distribution.sh
@@ -27,7 +27,6 @@ RELEASE="false"
MVN="$PROJECT_DIR/build/mvn"
SBT="$PROJECT_DIR/build/sbt"
SBT_ENABLED="false"
-HADOOP_AWS_ENABLED="false"
function exit_with_usage {
echo "make-distribution.sh - tool for making binary distributions of
Celeborn"
@@ -63,11 +62,6 @@ while (( "$#" )); do
echo "Error: $1 is not supported"
exit_with_usage
;;
- -P*)
- if [[ "$1" == *"hadoop-aws"* ]]; then
- HADOOP_AWS_ENABLED="true"
- fi
- ;;
-*)
break
;;
@@ -262,8 +256,9 @@ function sbt_build_service {
echo "Celeborn $VERSION$GITREVSTRING" > "$DIST_DIR/RELEASE"
echo "Build flags: $@" >> "$DIST_DIR/RELEASE"
- if [[ "$HADOOP_AWS_ENABLED" == "true" ]]; then
- export SBT_MAVEN_PROFILES="hadoop-aws"
+
+ if [[ $@ == *"hadoop-aws"* ]]; then
+ SBT_MAVEN_PROFILES="hadoop-aws"
fi
BUILD_COMMAND=("$SBT" clean package)