From 8a6dadc1a20a6b4d622516c560b8457ea1848fae Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Wed, 14 Oct 2026 11:45:01 -0700 Subject: [PATCH] ci: rebase the docs deploy onto gh-pages instead of force-pushing [ENG-1736] release-0.8 now deploys its docs to 0.8/docs on the same gh-pages branch, and chart-releaser pushes index.yaml there. The deploy action force-pushes by default, so a deploy that started before one of those and pushed after it would drop its commit. A concurrency group per branch keeps main's own deploys in order. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01UhM4wHR2xPP8bbrkXGaqUD --- .github/workflows/sync-docs.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync-docs.yaml b/.github/workflows/sync-docs.yaml index 67db41a..0318c5c 100644 --- a/.github/workflows/sync-docs.yaml +++ b/.github/workflows/sync-docs.yaml @@ -5,6 +5,10 @@ on: branches: - main +# A later push's deploy carries every earlier change, so a queued one can be dropped. +concurrency: + group: sync-docs-${{ github.ref }} + jobs: release: # depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions @@ -26,4 +30,8 @@ jobs: uses: JamesIves/github-pages-deploy-action@v4 with: folder: docs - target-folder: docs \ No newline at end of file + target-folder: docs + # Rebase onto gh-pages instead of force-pushing: the release-0.8 docs + # deploy (0.8/docs) and chart-releaser also push there, and a force-push + # from a deploy that started before theirs would drop their commits. + force: false \ No newline at end of file