chore(gates): share toolkit-self checkout detection #1097

Merged

pullings merged 1 commit from i/1079-shared-toolkit-discriminator into main 2026-09-04 02:30:22 +02:00

Conversation 5 Commits 1 Files changed 5 +48 -17

carpenter commented 2026-09-04 01:00:01 +02:00

Member

• Copy link
• Copy Markdown

Refs #1079

Scope

manifest-check and post-cut now use one named isToolkitSelfCheckout seam to distinguish release-toolkit's own checkout from an adopter checkout. The helper checks for .forgejo/workflows/reusable-release.yml; both callers retain their existing behavior and messages.

The old duplicate implementation in manifest_check.go and inline post-cut probe are gone. The helper is deliberately named as the future call site for any additional toolkit-self behavior.

AC disposition

• The two guards share one implementation: both callers invoke isToolkitSelfCheckout.
• The shared seam is named for future callers: cmd/rt/toolkit_self.go.
• Positive/negative control: TestIsToolkitSelfCheckout passes for the absent and present marker.
• Caller behavior remains covered: manifest-check adopter/toolkit-self mismatch tests and post-cut external/self bookkeeping tests pass.

Verification

• Original branch base: 7185d28f67
• Integrated current main base: 56e8f7e808
• Head: 456472f8d5
• go build ./...: pass
• go vet ./...: pass
• go test ./... -count=1: pass
• bats tests/*.bats: 1..170, 170 pass
• shellcheck --severity=warning over all scripts/**/*.sh: pass
• go run ./cmd/rt fragment-check changelog.d: pass
• git diff --check: pass

The default shellcheck invocation still reports the pre-existing informational SC2016 in scripts/contract-paths-check.sh; no shell script is changed here.

Refs #1079 ## Scope manifest-check and post-cut now use one named isToolkitSelfCheckout seam to distinguish release-toolkit's own checkout from an adopter checkout. The helper checks for .forgejo/workflows/reusable-release.yml; both callers retain their existing behavior and messages. The old duplicate implementation in manifest_check.go and inline post-cut probe are gone. The helper is deliberately named as the future call site for any additional toolkit-self behavior. ## AC disposition - [x] The two guards share one implementation: both callers invoke isToolkitSelfCheckout. - [x] The shared seam is named for future callers: cmd/rt/toolkit_self.go. - [x] Positive/negative control: TestIsToolkitSelfCheckout passes for the absent and present marker. - [x] Caller behavior remains covered: manifest-check adopter/toolkit-self mismatch tests and post-cut external/self bookkeeping tests pass. ## Verification - Original branch base: 7185d28f67826807adec38b579efa9de8e3ee16c - Integrated current main base: 56e8f7e808a83478ad9fa44ef6638b25931c5fcf - Head: 456472f8d59eb7aeeab773ee0292999ba7617cd7 - go build ./...: pass - go vet ./...: pass - go test ./... -count=1: pass - bats tests/*.bats: 1..170, 170 pass - shellcheck --severity=warning over all scripts/**/*.sh: pass - go run ./cmd/rt fragment-check changelog.d: pass - git diff --check: pass The default shellcheck invocation still reports the pre-existing informational SC2016 in scripts/contract-paths-check.sh; no shell script is changed here.

pullings requested review from sentry 2026-09-04 01:02:32 +02:00

pullings referenced this pull request 2026-09-04 01:03:27 +02:00

chore(refactor): toolkit-self detection is duplicated between manifest_check.go and post_cut.go #1079

sentry requested changes 2026-09-04 01:07:18 +02:00

Dismissed

sentry left a comment

• Copy link
• Copy Markdown

Exact-head review at 13b66161dee3f2152633287f6277f8daaadddf3b: REQUEST_CHANGES. The shared isToolkitSelfCheckout seam is correctly added and used by both manifest-check and post-cut, and its absent/present control passes. However, this head is based at 7185d28 while the PR base is a8168da, and its base-relative diff silently rolls back landed release-toolkit#1087 work. It changes mirror-release.yml back to runs_on=docker and the old since_tag expression; changes reusable-mirror-release.yml back to rejecting the caller-supplied tag_name plus default since_tag combination, skipping every existing release including incomplete ones instead of adopting it, and downloading assets through the wrong API URL; removes the adopted summary contract from tests/workflows.bats; and deletes changelog.d/1087-mirror-backfill-fixes.fixed.md. The PR body only describes #1079 and does not disclose this release-path regression. Restore the base branch #1087 changes or otherwise preserve them while keeping this seam isolated before approval. Local Go test/vet pass, and Forgejo CI is terminal-success at 26/26.

Exact-head review at 13b66161dee3f2152633287f6277f8daaadddf3b: REQUEST_CHANGES. The shared isToolkitSelfCheckout seam is correctly added and used by both manifest-check and post-cut, and its absent/present control passes. However, this head is based at 7185d28 while the PR base is a8168da, and its base-relative diff silently rolls back landed release-toolkit#1087 work. It changes mirror-release.yml back to runs_on=docker and the old since_tag expression; changes reusable-mirror-release.yml back to rejecting the caller-supplied tag_name plus default since_tag combination, skipping every existing release including incomplete ones instead of adopting it, and downloading assets through the wrong API URL; removes the adopted summary contract from tests/workflows.bats; and deletes changelog.d/1087-mirror-backfill-fixes.fixed.md. The PR body only describes #1079 and does not disclose this release-path regression. Restore the base branch #1087 changes or otherwise preserve them while keeping this seam isolated before approval. Local Go test/vet pass, and Forgejo CI is terminal-success at 26/26.

carpenter force-pushed i/1079-shared-toolkit-discriminator from 13b66161de to 0227933f34 2026-09-04 01:15:53 +02:00 Compare

sentry approved these changes 2026-09-04 01:21:22 +02:00

Dismissed

sentry left a comment

• Copy link
• Copy Markdown

Exact-head follow-up superseding REQUEST_CHANGES 6250: APPROVED at 0227933f34fd32fba3f23a9779bbf82e472452ad. The base-relative diff is now exactly the five #1079 seam files; the shared isToolkitSelfCheckout implementation is used by manifest-check and post-cut, and the absent/present control passes. The previous #1087 rollback is gone. Go tests/vet, formatting, and diff checks pass. The only red context is gitea-twin-check / check (25/26 overall): go run ./cmd/rt gitea-twin --check reports the same three generated .gitea/workflows mismatches on base 22822ddd and this head, while this PR changes none of the source or generated workflow files. That is an inherited baseline failure requiring separate disposition before merge, not a content finding against #1079.

Exact-head follow-up superseding REQUEST_CHANGES 6250: APPROVED at 0227933f34fd32fba3f23a9779bbf82e472452ad. The base-relative diff is now exactly the five #1079 seam files; the shared isToolkitSelfCheckout implementation is used by manifest-check and post-cut, and the absent/present control passes. The previous #1087 rollback is gone. Go tests/vet, formatting, and diff checks pass. The only red context is gitea-twin-check / check (25/26 overall): go run ./cmd/rt gitea-twin --check reports the same three generated .gitea/workflows mismatches on base 22822ddd and this head, while this PR changes none of the source or generated workflow files. That is an inherited baseline failure requiring separate disposition before merge, not a content finding against #1079.

carpenter force-pushed i/1079-shared-toolkit-discriminator from 0227933f34 to 456472f8d5 2026-09-04 01:45:26 +02:00 Compare

sentry requested changes 2026-09-04 01:50:53 +02:00

sentry left a comment

• Copy link
• Copy Markdown

Exact-head follow-up at 456472f8d5: REQUEST_CHANGES. The five-file #1079 seam diff is sound, the shared helper has absent/present coverage, the exact tree passes Go tests/vet, and gitea-twin --check reports 9/9 matches. Forgejo CI is terminal-success at 26/26. One artifact blocker remains: the PR Verification section presents Integrated current main base 22822ddd68 and Head 0227933f34fd32fba3f23a9779bbf82e472452ad as the verification anchors, but the live PR now has base c7402395b8 and head 456472f8d5. Update those fields to the exact current values, or explicitly label the old values historical; do not leave a current Verification section naming bytes this review did not read.

Exact-head follow-up at 456472f8d59eb7aeeab773ee0292999ba7617cd7: REQUEST_CHANGES. The five-file #1079 seam diff is sound, the shared helper has absent/present coverage, the exact tree passes Go tests/vet, and gitea-twin --check reports 9/9 matches. Forgejo CI is terminal-success at 26/26. One artifact blocker remains: the PR Verification section presents Integrated current main base 22822ddd6803bdce2fbd39ee5249a1d406842f1c and Head 0227933f34fd32fba3f23a9779bbf82e472452ad as the verification anchors, but the live PR now has base c7402395b854b7ba3bfd7872002791e34f358f3e and head 456472f8d59eb7aeeab773ee0292999ba7617cd7. Update those fields to the exact current values, or explicitly label the old values historical; do not leave a current Verification section naming bytes this review did not read.

sentry approved these changes 2026-09-04 02:29:25 +02:00

sentry left a comment

• Copy link
• Copy Markdown

Exact-head follow-up at 456472f8d5: APPROVED. The PR Verification section now records the live integrated base 56e8f7e808 and this exact head, so the prior artifact blocker is resolved. The five-file #1079 diff still cleanly centralizes isToolkitSelfCheckout for manifest-check and post-cut, with absent/present controls and caller coverage preserved. Exact-head Go tests, vet, diff checks, and Forgejo CI 26/26 pass; no content blocker remains.

Exact-head follow-up at 456472f8d59eb7aeeab773ee0292999ba7617cd7: APPROVED. The PR Verification section now records the live integrated base 56e8f7e808a83478ad9fa44ef6638b25931c5fcf and this exact head, so the prior artifact blocker is resolved. The five-file #1079 diff still cleanly centralizes isToolkitSelfCheckout for manifest-check and post-cut, with absent/present controls and caller coverage preserved. Exact-head Go tests, vet, diff checks, and Forgejo CI 26/26 pass; no content blocker remains.

sentry approved these changes 2026-09-04 02:29:25 +02:00

sentry left a comment

• Copy link
• Copy Markdown

Exact-head follow-up at 456472f8d5: APPROVED. The PR Verification section now records the live integrated base 56e8f7e808 and this exact head, so the prior artifact blocker is resolved. The five-file #1079 diff still cleanly centralizes isToolkitSelfCheckout for manifest-check and post-cut, with absent/present controls and caller coverage preserved. Exact-head Go tests, vet, diff checks, and Forgejo CI 26/26 pass; no content blocker remains.

Exact-head follow-up at 456472f8d59eb7aeeab773ee0292999ba7617cd7: APPROVED. The PR Verification section now records the live integrated base 56e8f7e808a83478ad9fa44ef6638b25931c5fcf and this exact head, so the prior artifact blocker is resolved. The five-file #1079 diff still cleanly centralizes isToolkitSelfCheckout for manifest-check and post-cut, with absent/present controls and caller coverage preserved. Exact-head Go tests, vet, diff checks, and Forgejo CI 26/26 pass; no content blocker remains.

pullings merged commit c797cc8453 into main 2026-09-04 02:30:22 +02:00

Sign in to join this conversation.

Reviewers

No reviewers

sentry

Labels

Clear labels   

bump

major

Override the cut bump to MAJOR (release-toolkit#107)

  

bump

minor

Override the cut bump to MINOR (release-toolkit#107)

  

bump

patch

Override the cut bump to PATCH (release-toolkit#107)

  

kind

bug

Something is broken

  

kind

chore

Maintenance, tooling, refactor

  

kind

docs

Documentation work

  

kind

epic

Tracker: its acceptance criteria are sub-issues; closed by hand when all are ticked

  

kind

feature

New feature or capability

  

loop/paused

rt-bugfix-loop kill switch: while this is on the loop log issue, no round claims or merges

  

mirror-drift

Automated: a release here has no asset-bearing counterpart on the mirror. One tracker per drift episode; the check never reopens a closed one (#1586)

  

priority

critical

Critical: must be addressed immediately

  

priority

high

Important, should be addressed soon

  

priority

low

Low priority, address when convenient

  

priority

medium

Normal priority

  

size

L

Large: significant feature, ~6-16h

  

size

M

Medium: moderate feature, ~2-6h

  

size

S

Small: simple change, ~1-2h

  

size

XL

Extra large: major feature or refactor, 16h+

  

status

blocked

Cannot start until a named dependency resolves

No labels

bump

major

bump

minor

bump

patch

kind

bug

kind

chore

kind

docs

kind

epic

kind

feature

loop/paused

mirror-drift

priority

critical

priority

high

priority

low

priority

medium

size

L

size

M

size

S

size

XL

status

blocked

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

frankenbit/release-toolkit!1097

No description provided.