Skip to content

ci: fail a pull request that starts before the latest release - #61

Merged
0b3l1X-SolidGeeks merged 1 commit into
mainfrom
claude/strata-incident-muster-entlk7
Oct 28, 2026
Merged

0b3l1X-SolidGeeks merged 1 commit into
mainfrom
claude/strata-incident-muster-entlk7

Conversation

@0b3l1X-SolidGeeks

Copy link
Copy Markdown
Member

What this changes

A new base job in the CI checks the branch as pushed, not the merge GitHub prepares (that merge always contains main):

  • Fails when the branch does not include the latest v… tag of the base branch (today v0.9.0). The error names the tag, says how many commits behind the branch is, and gives the commands to update it (rebase or merge main).
  • Passes with a notice when the branch includes that tag but lags a few commits behind, so that every merge to main does not turn every open PR red.

Why: #60 started 32 commits back, before 0.7.0. It conflicted, and it would have undone the 413 handling that 0.7.0 fixed. The README (section 14) explains the rule.

How to check it

The job's script, run locally against real branches:

On this PR the job should be green, since the branch starts from the current main.

Two things only a maintainer can do in the settings:

  • To make the job block merging, add base to the required status checks of main.
  • For a first-time contributor's fork, the CI, this job included, runs only after "Approve and run".

The Solid checklist

  • Tests cover the change and pass in CI (the job runs on this PR; the script was checked locally on the branches above)
  • Docs are updated (README, section 14)
  • No secrets, keys or personal data in the diff
  • Every commit is signed off (git commit -s, see DCO)
  • New files carry the repo's SPDX license header (no new file)

Generated by Claude Code

A pull request made from an old main undoes what was fixed since and
conflicts (strata#60 started 32 commits back, before 0.7.0). The new
`base` job checks out the branch as pushed, not the merge GitHub
prepares, and fails when it does not include the latest v… tag of the
base branch, with the commands to update it. A branch a few commits
behind only gets a notice.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Ke7yEW5dhDYFVpV2cdgs87
Signed-off-by: Claude <noreply@anthropic.com>
@0b3l1X-SolidGeeks
0b3l1X-SolidGeeks merged commit 9181cc0 into main Oct 28, 2026
10 checks passed
@0b3l1X-SolidGeeks
0b3l1X-SolidGeeks deleted the claude/strata-incident-muster-entlk7 branch October 28, 2026 10:48
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