From 903ee9a224686424a6b5b3da6937ed630748104e Mon Sep 17 00:00:00 2001
From: Nicholas Chammas <nicholas.chammas@gmail.com>
Date: Wed, 14 Oct 2026 10:20:57 +0300
Subject: [PATCH 1/2] one commit and push for spark-website during release

---
 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 b685dfd25cbe5..d8e65316e308f 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:$ASF_PASSWORD@gitbox.apache.org/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 "Add docs and website updates 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.

From f17b0ac8ebe209987b1add1ac1a09d7de669e0da Mon Sep 17 00:00:00 2001
From: Nicholas Chammas <nicholas.chammas@gmail.com>
Date: Wed, 14 Oct 2026 10:34:25 +0300
Subject: [PATCH 2/2] commit wording tweak

---
 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 d8e65316e308f..36ec915a134e0 100755
--- a/dev/create-release/release-build.sh
+++ b/dev/create-release/release-build.sh
@@ -534,7 +534,7 @@ EOF
   fi
 
   git add .
-  git commit -m "Add docs and website updates 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,