From 0813d72795ccdd59a1059640a01e34efebf747d0 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Mon, 5 Oct 2026 18:12:04 +0100
Subject: [PATCH] Serialise CI deploys to GitHub Pages

---
 .github/workflows/ci.yml | 8 ++++++++
 bin/build-tw-org.sh      | 2 +-
 bin/ci-push.sh           | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 870030f20d..bff0e478c0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,6 +25,10 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/master'
     needs: test
+    # Both build jobs push to the same GitHub Pages repository, so they must not overlap
+    concurrency:
+      group: gh-pages-deploy
+      cancel-in-progress: false
     env:
       TW5_BUILD_TIDDLYWIKI: "./tiddlywiki.js"
       TW5_BUILD_MAIN_EDITION: "./editions/prerelease"
@@ -56,6 +60,10 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/tiddlywiki-com'
     needs: test
+    # Both build jobs push to the same GitHub Pages repository, so they must not overlap
+    concurrency:
+      group: gh-pages-deploy
+      cancel-in-progress: false
     env:
       TW5_BUILD_TIDDLYWIKI: "./node_modules/tiddlywiki/tiddlywiki.js"
       TW5_BUILD_MAIN_EDITION: "./editions/tw5.com"
diff --git a/bin/build-tw-org.sh b/bin/build-tw-org.sh
index 9cff68c7b2..710ede793d 100755
--- a/bin/build-tw-org.sh
+++ b/bin/build-tw-org.sh
@@ -93,5 +93,5 @@ git config --global user.name "GitHub Actions"
 git add -A .
 git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))"
 git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.org-gh-pages.git" &>/dev/null
-git push deploy main &>/dev/null
+git push deploy main
 popd
diff --git a/bin/ci-push.sh b/bin/ci-push.sh
index fe8373785e..468e0cb41e 100755
--- a/bin/ci-push.sh
+++ b/bin/ci-push.sh
@@ -11,5 +11,5 @@ git config --global user.name "GitHub Actions"
 git add -A .
 git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))"
 git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" &>/dev/null
-git push deploy master &>/dev/null
+git push deploy master
 cd ..