This is an automated email from the ASF dual-hosted git repository.
srowen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new abc937b [MINOR][BUILD] Remove binary license/notice files in a source
release for branch-2.4+ only
abc937b is described below
commit abc937b24756e5d7479bac7229b0b4c1dc82efeb
Author: Takeshi Yamamuro <yamam...@apache.org>
AuthorDate: Mon Jan 14 19:17:39 2019 -0600
[MINOR][BUILD] Remove binary license/notice files in a source release for
branch-2.4+ only
## What changes were proposed in this pull request?
To skip some steps to remove binary license/notice files in a source
release for branch2.3 (these files only exist in master/branch-2.4 now), this
pr checked a Spark release version in `dev/create-release/release-build.sh`.
## How was this patch tested?
Manually checked.
Closes #23538 from maropu/FixReleaseScript.
Authored-by: Takeshi Yamamuro <yamam...@apache.org>
Signed-off-by: Sean Owen <sean.o...@databricks.com>
---
dev/create-release/release-build.sh | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/dev/create-release/release-build.sh
b/dev/create-release/release-build.sh
index 2fdb5c8..3b5f9ef 100755
--- a/dev/create-release/release-build.sh
+++ b/dev/create-release/release-build.sh
@@ -176,10 +176,14 @@ if [[ "$1" == "package" ]]; then
# Source and binary tarballs
echo "Packaging release source tarballs"
cp -r spark spark-$SPARK_VERSION
- # For source release, exclude copy of binary license/notice
- rm spark-$SPARK_VERSION/LICENSE-binary
- rm spark-$SPARK_VERSION/NOTICE-binary
- rm -r spark-$SPARK_VERSION/licenses-binary
+
+ # For source release in v2.4+, exclude copy of binary license/notice
+ if [[ $SPARK_VERSION > "2.4" ]]; then
+ rm spark-$SPARK_VERSION/LICENSE-binary
+ rm spark-$SPARK_VERSION/NOTICE-binary
+ rm -r spark-$SPARK_VERSION/licenses-binary
+ fi
+
tar cvzf spark-$SPARK_VERSION.tgz spark-$SPARK_VERSION
echo $GPG_PASSPHRASE | $GPG --passphrase-fd 0 --armour --output
spark-$SPARK_VERSION.tgz.asc \
--detach-sig spark-$SPARK_VERSION.tgz
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
