Skip to content

fix(ci): derive release base in never-supersede concurrency (not hardcoded master/main) #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Shinrai merged 1 commit into from
Aug 4, 2026
Merged

fix(ci): derive release base in never-supersede concurrency (not hardcoded master/main) #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,19 +139,23 @@ on:
# Concurrency policy, by context:
# - FEATURE branches / feature PRs → cancel superseded runs (per-ref group +
# cancel-in-progress): a newer push makes the older run redundant.
# - RELEASE-relevant contexts → NEVER superseded. Pushes to
# master/main/next/hotfixes and the next/hotfixes → master/main release PRs
# each get a UNIQUE group per run (run_id appended), so nothing cancels them.
# During the burst of pushes a release makes to next/hotfixes (the feature
# squash, the post-hotfix master→next sync merge, the bot's `chore: bump
# version`), every run completes and posts a GREEN check instead of the
# earlier one being cancelled into a red X on the release PR. A bare
# `cancel-in-progress: false` is NOT enough — GitHub still cancels the middle
# PENDING run when a newer one queues; a unique group avoids all of it.
# github.head_ref is set only on pull_request (the PR's head → next/hotfixes for
# release PRs); github.ref carries the branch on push.
# - RELEASE-relevant contexts → NEVER superseded. Pushes to the release base
# branch (derived: the CLDMV_RELEASE_BASE var → the repo's default branch),
# to next/hotfixes, and the next/hotfixes → base release PRs each get a
# UNIQUE group per run (run_id appended), so nothing cancels them. During
# the burst of pushes a release makes to next/hotfixes (the feature squash,
# the post-hotfix base→next sync merge, the bot's `chore: bump version`),
# every run completes and posts a GREEN check instead of the earlier one
# being cancelled into a red X on the release PR. A bare
# `cancel-in-progress: false` is NOT enough — GitHub still cancels the
# middle PENDING run when a newer one queues; a unique group avoids it.
# The base is NOT hardcoded to master/main — it derives the same way
# resolve-release-base does (CLDMV_RELEASE_BASE override → default_branch).
# next/hotfixes are the flow's fixed integration-branch names. github.head_ref
# is set only on pull_request (the release PR's head → next/hotfixes);
# github.ref carries the branch on push.
concurrency:
group: ci-${{ github.workflow }}-${{ github.ref }}${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/next' || github.ref == 'refs/heads/hotfixes' || github.head_ref == 'next' || github.head_ref == 'hotfixes') && format('-{0}', github.run_id) || '' }}
group: ci-${{ github.workflow }}-${{ github.ref }}${{ (github.ref == format('refs/heads/{0}', vars.CLDMV_RELEASE_BASE != '' && vars.CLDMV_RELEASE_BASE || github.event.repository.default_branch) || github.ref == 'refs/heads/next' || github.ref == 'refs/heads/hotfixes' || github.head_ref == 'next' || github.head_ref == 'hotfixes') && format('-{0}', github.run_id) || '' }}
cancel-in-progress: true

# Workflow-level: matches the broadest write surface the called
Expand Down
Loading