This is an automated email from the ASF dual-hosted git repository.
nchammas pushed a commit to branch branch-4.x
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-4.x by this push:
new 3fc4021075fe [SPARK-60234][INFRA] During releases create a single
spark-website commit
3fc4021075fe is described below
commit 3fc4021075fee6df41fc0d98c590fe68d21f2545
Author: Nicholas Chammas <[email protected]>
AuthorDate: Tue Oct 27 11:05:38 2026 +0200
[SPARK-60234][INFRA] During releases create a single spark-website commit
### What changes were proposed in this pull request?
During a release, create only one spark-website commit and push.
In other words, instead of having both:
- "Add docs for Apache Spark 3.5.9"
https://github.com/apache/spark-website/commit/136c8484c513b5f0b38c84b76af9b9ab9dd2d8a5
- "Add release docs for Apache Spark 3.5.9"
https://github.com/apache/spark-website/commit/7d894faa0fab793dbee9b0c17ea51ddf1f156565
We'd have a single spark-website commit: "Update docs and website for
Apache Spark 3.5.9"
### Why are the changes needed?
There is no need for two separate commits. They appear to be a historical
artifact rather than a conscious design choice.
The separate commits also make it more likely that someone will later
inadvertently re-introduce the double push that we eliminated in #59071, which
may trigger some annoying push failures due to the new spark-website CI setup.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Tested locally via GitHub Copilot with a disposable Git repository and bare
remote. The exact `git add .` → `git commit` → `git push origin HEAD:asf-site`
flow successfully included documentation.md, generated docs, and nested assets
in one commit. Also passed `bash -n` and `git diff --check`.
### Was this patch authored or co-authored using generative AI tooling?
I wrote this with assistance from Github Copilot.
Closes #59457 from nchammas/website-release-single-commit.
Authored-by: Nicholas Chammas <[email protected]>
Signed-off-by: Nicholas Chammas <[email protected]>
(cherry picked from commit 702a0ecde76b3c3220f1613248ce053d3ad0f580)
Signed-off-by: Nicholas Chammas <[email protected]>
---
dev/create-release/release-build.sh | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/dev/create-release/release-build.sh
b/dev/create-release/release-build.sh
index b685dfd25cbe..36ec915a134e 100755
--- a/dev/create-release/release-build.sh
+++ b/dev/create-release/release-build.sh
@@ -154,19 +154,14 @@ if [[ "$1" == "finalize" ]]; then
rm -rf svn-spark
echo "PySpark uploaded"
- # download the docs from the dev directory and upload it to spark-website
- echo "Uploading docs to spark-website"
+ # Download the generated docs, then publish them with the website updates
below.
+ echo "Preparing spark-website"
svn co "$RELEASE_STAGING_LOCATION/$RELEASE_TAG-docs" docs
git clone
"https://$ASF_USERNAME:[email protected]/repos/asf/spark-website.git";
-b asf-site
mv docs/_site "spark-website/site/docs/$RELEASE_VERSION"
cd spark-website
- git add site/docs/$RELEASE_VERSION
- git commit -m "Add docs for Apache Spark $RELEASE_VERSION"
- cd ..
- echo "docs committed for later upload"
- echo "Uploading release docs to spark-website"
- cd spark-website
+ echo "Updating spark-website for the release"
# 1. Add download link to documentation.md
python3 <<EOF
@@ -539,13 +534,14 @@ EOF
fi
git add .
- git commit -m "Add release docs for Apache Spark $RELEASE_VERSION"
+ git commit -m "Update docs and website for Apache Spark $RELEASE_VERSION"
+ # One commit and one push.
# We want to `git push` the website only once to eliminate the chance that
# multiple pushes will race with spark-website CI pushing HTML commits,
# creating annoying fast-forward failures.
git push origin HEAD:asf-site
cd ..
- echo "release docs uploaded"
+ echo "spark-website updated"
rm -rf spark-website
# Moves the docs from dev directory to release directory.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
