Skip to content

ci: rebase the docs deploy onto gh-pages instead of force-pushing [ENG-1736] - #63

Merged
twk3 merged 1 commit into
mainfrom
ci/rebase-docs-deploy
Oct 14, 2026
Merged

twk3 merged 1 commit into
mainfrom
ci/rebase-docs-deploy

Conversation

@twk3

@twk3 twk3 commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

Stops main's docs deploy from force-pushing over gh-pages (ENG-1736).

gh-pages is about to receive pushes from three places:

JamesIves/github-pages-deploy-action force-pushes by default. A deploy that checks out gh-pages, then pushes after one of the others, drops the other's commit: 0.8/docs reverts, or a new chart version disappears from index.yaml.

Changes

  • force: false: the action rebases its commit onto the current gh-pages instead.
  • A concurrency group per branch, sync-docs-${{ github.ref }}: keeps main's own deploys in order. A queued deploy can be dropped, because the next one carries every earlier change.

There's deliberately no group shared with release-0.8. GitHub keeps one pending run per group and cancels the older one, which would silently drop the other branch's deploy.

#62 makes the same change on release-0.8. Merge this one before or with it.

Testing

  • The workflow parses, with force: false and the concurrency group in place.
  • The deploy itself runs on the next push to main.

🤖 Generated with Claude Code

https://claude.ai/code/session_01UhM4wHR2xPP8bbrkXGaqUD


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need.

…G-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 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UhM4wHR2xPP8bbrkXGaqUD
@baz-reviewer

baz-reviewer Bot commented Oct 14, 2026 •

Copy link
Copy Markdown

Review this PR on Baz

Baz Summary

Update the sync-docs workflow to rebase documentation deployments onto gh-pages instead of force-pushing, preserving concurrent release and chart updates. Serialize main deployments with a branch-specific concurrency group while allowing other branches to publish independently.

Latest Contributors(1)
UserCommitDate
dj@currents.devci: rebase the docs de...October 14, 2026

Merger  Activate to get a short verdict whether this PR is good to go or not

Skills  Activate Skill Maintainer to keep your skills up to date

Planner  This PR would have been improved with Baz Planner - Try it now

@twk3
twk3 merged commit 9f5057c into main Oct 14, 2026
3 checks passed
@twk3
twk3 deleted the ci/rebase-docs-deploy branch October 14, 2026 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant