You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2023/03/29 06:30:39 UTC
[spark] branch branch-3.4 updated: [SPARK-42957][INFRA] `release-build.sh` should not remove SBOM artifacts
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new 22564598879 [SPARK-42957][INFRA] `release-build.sh` should not remove SBOM artifacts
22564598879 is described below
commit 2256459887984b77c02b5412d987245c3a36cb24
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Tue Mar 28 23:30:18 2023 -0700
[SPARK-42957][INFRA] `release-build.sh` should not remove SBOM artifacts
### What changes were proposed in this pull request?
This PR aims to prevent `release-build.sh` from removing SBOM artifacts.
### Why are the changes needed?
According to the snapshot publishing result, we are publishing `.json` and `.xml` files successfully.
- https://repository.apache.org/content/repositories/snapshots/org/apache/spark/spark-core_2.12/3.4.1-SNAPSHOT/spark-core_2.12-3.4.1-20230324.001223-34-cyclonedx.json
- https://repository.apache.org/content/repositories/snapshots/org/apache/spark/spark-core_2.12/3.4.1-SNAPSHOT/spark-core_2.12-3.4.1-20230324.001223-34-cyclonedx.xml
However, `release-build.sh` removes them during release. The following is the result of Apache Spark 3.4.0 RC4.
- https://repository.apache.org/content/repositories/orgapachespark-1438/org/apache/spark/spark-core_2.12/3.4.0/
### Does this PR introduce _any_ user-facing change?
Yes, the users will see the SBOM on released artifacts.
### How was this patch tested?
This should be tested during release process.
Closes #40585 from dongjoon-hyun/SPARK-42957.
Authored-by: Dongjoon Hyun <do...@apache.org>
Signed-off-by: Dongjoon Hyun <do...@apache.org>
(cherry picked from commit f5c5124c30ecf987b3114f0a991c9ee9831ce42a)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
dev/create-release/release-build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh
index ccf403cb916..0107e1cb2c0 100755
--- a/dev/create-release/release-build.sh
+++ b/dev/create-release/release-build.sh
@@ -473,7 +473,7 @@ if [[ "$1" == "publish-release" ]]; then
pushd $tmp_repo/org/apache/spark
# Remove any extra files generated during install
- find . -type f |grep -v \.jar |grep -v \.pom | xargs rm
+ find . -type f |grep -v \.jar |grep -v \.pom |grep -v \.xml |grep -v \.json | xargs rm
echo "Creating hash and signature files"
# this must have .asc, .md5 and .sha1 - it really doesn't like anything else there
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org