Skip to content

fix(ci): recover concurrent blog, catalog and lockfile updates - #242

Merged
joaosouz4dev merged 2 commits into
mainfrom
fix/workflow-concurrency-20261117
Nov 17, 2026
Merged

joaosouz4dev merged 2 commits into
mainfrom
fix/workflow-concurrency-20261117

Conversation

@joaosouz4dev

Copy link
Copy Markdown
Member

When another workflow advances main during the blog build, its final push is rejected and requires a manual rerun. Rebase the generated posts onto the current target branch and retry up to three times, preserving unrelated commits and rejecting genuine file conflicts. Keep deployment separate so unchanged content does not dispatch a publication.

Limit each updater's rebase fetch to its target branch. This avoids downloading gh-pages and unrelated branch history, which took more than eight minutes in the observed versions run. Add a concurrency group for duplicate blog runs while retaining independent blog, catalog and lockfile updates.

Validation: 28 local regression tests covering all three commit steps, concurrent commits before and between rebase/push, identical updates, real conflicts, bounded retries, branch-limited fetching and conditional publication. Actionlint and git diff --check pass. The existing CI covers typecheck, dependencies, shared design checks and the bilingual production build.

@joaosouz4dev
joaosouz4dev merged commit 605c495 into main Nov 17, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant