Skip to content

ci: refuse conflict markers on release/0.7.x - #3215

Merged
norrietaylor merged 1 commit into
release/0.7.xfrom
ci/port-conflict-markers-0.7.x
Nov 9, 2026
Merged

norrietaylor merged 1 commit into
release/0.7.xfrom
ci/port-conflict-markers-0.7.x

Conversation

@norrietaylor

Copy link
Copy Markdown
Member

Ports the conflict-marker scan from #3174 to release/0.7.x by hand. Bryan's review finding 4 on #3174: the line has no marker scan, so a draft conflict backport marked ready too early could merge with ci-success green.

Changes

The backport bot cannot make this port itself: its token has no workflows permission.

Order

This is a precondition for setting BACKPORT_ENABLED, not for rc2. It can merge before #3174; the scan stands on its own.

Test plan

  • The scan finds no markers on the line tip (412b9d24).
  • scripts/check-conflict-markers_test.sh: 12 pass.
  • shellcheck and actionlint pass.

Ports the conflict-marker scan from #3174 by hand, so a draft backport with
committed conflicts cannot merge onto the line with ci-success green. The
backport bot cannot do this port, because its token has no workflows
permission. Adds scripts/check-conflict-markers.sh, its test, and the
conflict-markers job under ci-success.
@norrietaylor
norrietaylor requested a review from a team as a code owner November 9, 2026 23:12
@coderabbitai

coderabbitai Bot commented Nov 9, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Essentials
  • Run ID: 55fa2ce2-3b3a-45a7-9983-139ded70c328

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

@minimal-foundry

minimal-foundry Bot commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Approved: no findings at b6fe9187b433.

Nothing to do.

Clobber: none: the files are new and the ci-success change only adds a need.

@minimal-foundry minimal-foundry Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minimal-review — approved

Verdict APPROVE — No findings.

Panel: 3 of 3 personas ran (correctness, security, supply-chain).

@minimal-foundry minimal-foundry Bot added the review:approved minimal-review approved the current head label Nov 9, 2026
@norrietaylor
norrietaylor merged commit 109af58 into release/0.7.x Nov 9, 2026
28 checks passed
@norrietaylor
norrietaylor deleted the ci/port-conflict-markers-0.7.x branch November 9, 2026 23:20
norrietaylor added a commit that referenced this pull request Nov 10, 2026
#3181 landed on the line as one squash commit (412b9d2) with the same tree
as the reviewed head ca4492f that this branch carries, so every conflict
keeps this branch's side. Also brings in #3215.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

review:approved minimal-review approved the current head

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant