Repository navigation
fix(ci): recover concurrent blog, catalog and lockfile updates - #242
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.