From ba07a8da5ef8bfa2c69257b9047d82c7c99922d3 Mon Sep 17 00:00:00 2001 From: Nicholas Chammas Date: Sat, 26 Sep 2026 15:33:07 +0300 Subject: [PATCH] push to spark-website only once --- 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 cdeec37c4eddf..b685dfd25cbe5 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"