Skip to content

fix(version): fail after a version push and push with a lease on the PR head - #2

Merged
michal-giergielewicz merged 1 commit into
mainfrom
fix/version-push-fails
Nov 10, 2026
Merged

michal-giergielewicz merged 1 commit into
mainfrom
fix/version-push-fails

Conversation

@michal-giergielewicz

Copy link
Copy Markdown
Contributor

Problem

On freyr-claude-plugin #31 the version job pushed chore: set version sdlc 0.8.0 and then reported success. Auto-merge merged the old head (no required checks are enforced while the org ruleset main is in evaluate mode). The bot push landed after the merge and created a stray branch. Result: #31 shipped as sdlc--v0.7.2 instead of 0.8.0.

Change

  • The version job fails on purpose after it pushes a version commit. Only the new commit can get a green version check.
  • The push uses --force-with-lease=refs/heads/<head>:<head sha>. A merged (deleted) or moved branch rejects it.
  • README: states both rules, and that auto-merge waits for checks only while the ruleset main is active.

Check

CI of this repo (actionlint, zizmor, tests). The real check is the next PR in a repo that needs a bump.

…PR head

A version job that pushed the bump commit reported success, so auto-merge could merge the old head without the bump (freyr-claude-plugin #31). The push also created a stray branch after the merge deleted the PR branch.
@michal-giergielewicz
michal-giergielewicz merged commit 631e66e into main Nov 10, 2026
6 checks passed
@michal-giergielewicz
michal-giergielewicz deleted the fix/version-push-fails branch November 10, 2026 23:58
michal-giergielewicz added a commit to freyr/ragnarok-bundle that referenced this pull request Nov 11, 2026
Pins the shared freyr actions to v1.0.1. v1.0.1 makes the version job
fail after it pushes a version commit and pushes with a lease on the PR
head (freyr/.github#2).
michal-giergielewicz added a commit to freyr/identity that referenced this pull request Nov 11, 2026
Pins the shared freyr actions to v1.0.1. v1.0.1 makes the version job
fail after it pushes a version commit and pushes with a lease on the PR
head (freyr/.github#2).
michal-giergielewicz added a commit to freyr/traefik that referenced this pull request Nov 11, 2026
Pins the shared freyr actions to v1.0.1. v1.0.1 makes the version job
fail after it pushes a version commit and pushes with a lease on the PR
head (freyr/.github#2).
michal-giergielewicz added a commit to freyr/pc-mqtt-agent that referenced this pull request Nov 11, 2026
Pins the shared freyr actions to v1.0.1. v1.0.1 makes the version job
fail after it pushes a version commit and pushes with a lease on the PR
head (freyr/.github#2).
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