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 a21c0fa06c72 [MINOR][INFRA] During release, push to spark-website only
once
a21c0fa06c72 is described below
commit a21c0fa06c728e39b1b27f7fd2a061e75771afce
Author: Nicholas Chammas <[email protected]>
AuthorDate: Tue Oct 13 22:02:22 2026 +0300
[MINOR][INFRA] During release, push to spark-website only once
### What changes were proposed in this pull request?
Instead of pushing to spark-website twice during a release, push only once.
### Why are the changes needed?
https://github.com/apache/spark-website/pull/699 automates the generation
of HTML for the website. There could be a race between the release script's two
pushes and spark-website's CI push that causes the release script to fail. It
wouldn't be a disaster, just annoying. Better to avoid it by pushing to
spark-website only once from the release script.
Even if https://github.com/apache/spark-website/pull/699 is not merged,
this change is still valid (though the comment becomes stale). So it's better
to merge this before the spark-website PR is merged.
In the future, I think it would be better if we moved the portion of the
release script related to the website into the spark-website repo and just
called it from here. It's not great that we currently have to open PRs against
two separate repos for a change that should in theory be limited to the website
repo.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
I'm not sure how to test this holistically. Will think about that.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #59071 from nchammas/website-push.
Authored-by: Nicholas Chammas <[email protected]>
Signed-off-by: Nicholas Chammas <[email protected]>
(cherry picked from commit 0ae90bf48099e5e44a8517918ca9382d915719e5)
Signed-off-by: Nicholas Chammas <[email protected]>
---
dev/create-release/release-build.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev/create-release/release-build.sh
b/dev/create-release/release-build.sh
index cdeec37c4edd..b685dfd25cbe 100755
--- a/dev/create-release/release-build.sh
+++ b/dev/create-release/release-build.sh
@@ -162,9 +162,8 @@ if [[ "$1" == "finalize" ]]; then
cd spark-website
git add site/docs/$RELEASE_VERSION
git commit -m "Add docs for Apache Spark $RELEASE_VERSION"
- git push origin HEAD:asf-site
cd ..
- echo "docs uploaded"
+ echo "docs committed for later upload"
echo "Uploading release docs to spark-website"
cd spark-website
@@ -541,6 +540,9 @@ EOF
git add .
git commit -m "Add release docs for Apache Spark $RELEASE_VERSION"
+ # 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"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
