bleedingdeacons / tamar / 33970665334
83%

DEFAULT BRANCH: main
Ran
Jobs 1
Files 10
Run time 1min
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst
coverage: 41.386%. Remained the same
33970665334

push

github

web-flow 
fix: push the release commit first, rebase only if it is rejected

This job already rebased before pushing, so it was never exposed the way
Link's was — this is an upgrade to that, not a fix for a hole.

Rebasing first closes the long window, the minutes spent building, but
leaves a short one between the pull and the push, and nothing retried
it. Pushing first and rebasing only on rejection leaves no gap at all.

What the old form would eventually have cost is what Link actually paid
on 2026-09-05: a merge landed sixteen seconds before its push, git
refused the non-fast-forward, and the release died with every gate
already green. Nothing broke and nothing was published; the version was
simply lost, and the next release skipped a number to catch up. Link's
job had no rebase whatever, which is why it was the one that got caught.

The race is never two release jobs — the concurrency group serialises
those. It is a person merging while one is in flight, and the other
writer is not a job, so no job-level concurrency can see it.

A conflict is deliberately not retried. That matters slightly more here
than in Link, because the release commit spans the plugin header,
readme.txt, README.md and the bundled docs rather than one csproj line,
so there is more surface to collide with. The behaviour is unchanged
from today either way: the step fails, nothing is pushed, and the rebase
is aborted so the tree is not left mid-rebase.

The sha output is read after the loop on purpose. A rebase rewrites the
commit, and the release is published against that sha, so reading it
before the retry would point the release at a commit that never landed.

Verified against a simulated race in throwaway repos rather than by
inspection:

  - a merge touching an unrelated file lands first: attempt 1 rejected,
    rebase, attempt 2 succeeds, the version lands, and the sha written to
    GITHUB_OUTPUT matches the commit that actually ended up on main.
  - a merge touching the version fi... (continued)

454 of 1097 relevant lines covered (41.39%)

4.67 hits per line

Jobs
ID Job ID Ran Files Coverage
1 33970665334.1 10
41.39
GitHub Action Run
Source Files on build 33970665334