Skip to content

ci: recover a merged-but-untagged bump instead of double-bumping - #122

Merged
Larry-Osakwe merged 2 commits into
mainfrom
larry-osakwe/bump-recovery
Jul 16, 2026
Merged

ci: recover a merged-but-untagged bump instead of double-bumping#122
Larry-Osakwe merged 2 commits into
mainfrom
larry-osakwe/bump-recovery

Conversation

@Larry-Osakwe

@Larry-Osakwe Larry-Osakwe commented Jul 16, 2026

Copy link
Copy Markdown
Collaborator

Twin of keycardai/python-sdk#194, two fixes making the bump pipeline self-sufficient under the require-review ruleset:

  1. Direct merge as the bypass actor: the app is on the bypass list but auto-merge never exercises bypass; once checks are green the script merges explicitly, with auto-merge kept armed as fallback.
  2. Recover a merged-but-untagged bump: if the configured version is ahead of the last release tag with a merged bump commit, push the missing tag instead of re-running cz (yesterday's re-run double-bumped, spurious bump: keycardai-oauth → 0.21.0 #121).

Verified against live state: recovery is a no-op with 0.20.0-keycardai-oauth tagged, and the commit lookup resolves the 0.20.0 bump headline to #120's squash SHA.

🤖 Generated with Claude Code

When the merge-wait times out and the bump PR merges later, the version
files end up ahead of the last release tag with no tag to trigger the
publish. Re-running the job in that state re-runs cz against the bumped
version files and opens a spurious next-version PR. The bump now checks
for that state first and pushes the missing tag at the merged bump
commit instead.
The workflows app is on the ruleset bypass list, but auto-merge never
exercises bypass; it only fires when every requirement, including the
required review, is actually satisfied. Once the bump PR checks are
green the script now merges it explicitly, which the bypass permits.
Auto-merge stays armed as the fallback when a direct merge is refused.
@Larry-Osakwe
Larry-Osakwe merged commit 2efc251 into main Jul 16, 2026
4 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.

2 participants