Skip to content

ci: move ci-status onto the shared report-ci-status composite - #271

Merged
kyle-sexton merged 1 commit into
mainfrom
ci/report-ci-status-composite
Nov 18, 2026
Merged

kyle-sexton merged 1 commit into
mainfrom
ci/report-ci-status-composite

Conversation

@kyle-sexton

Copy link
Copy Markdown
Member

No related issue: a rollout step of melodic-software/ci-workflows#1138, which stays open until every repository has migrated.

Summary

Rollout of ci-workflows#1138: the ci-status job now runs the shared report-ci-status composite (ci-workflows#1139, v0.76.0) instead of its own check-contract and aggregate-results steps. CI Status stays the job's name and the single required check. Worked examples copied: songwriting#75 and codex-plugins#208.

Fix

  • ci-status steps: one report-ci-status step, then a "Fail on the contract or draft policy" step that fails on any outcome other than success, so an empty or renamed output fails closed. The composite step keeps the name Aggregate lane results, so a contract-only run still finds the writer step of a full run recorded before this change.
  • Behavior kept:
    • draft: allow: the job had no draft refusal and the workflow has no ready_for_review trigger.
    • treat-skipped-as: pass, now explicit. The old aggregate-results step set nothing and so ran on that action's default, pass (aggregate-results action.yml at v0.75.0); the composite's default is fail.
    • The job's if: always(), needs, permissions, runner and timeout are unchanged. No exempt authors, as before.
  • Concurrency: unchanged; a push already falls back to github.run_id.
  • Comments describe what the composite fixes (yield-to-full-run: 'true', carry-forward-wait-seconds: '0', action.yml L128-L129) instead of inputs the file no longer sets.
  • .github/scripts/pr-section-drift.mjs read the check-contract@<sha> pin from this workflow and would have failed the Check PR Sections lane with no such pin. It now also accepts the report-ci-status@<sha> pin, since that composite runs check-contract through $/ at its own commit, and fetches check-contract/run.sh at that SHA as before. Two cases added to its test.
  • Lines (git diff --numstat): workflow 32 removed, 42 added; pr-section-drift.mjs 5 removed, 11 added; its test 14 added.

Verification

  • actionlint .github/workflows/pr-require-checks.yml: no findings.
  • node --test .github/scripts/pr-section-drift.test.mjs: 29 passed.
  • node .github/scripts/pr-section-drift.mjs on this branch: "local mirrors match melodic-software/ci-workflows@ebd0e3b section_report calls [Summary, Fix, Verification, Related]".

Related

🤖 Generated with Claude Code

https://claude.ai/code/session_01Vcupoo79EqmECYFZ4MTv6C

The contract check and lane aggregation become one report-ci-status step
pinned at ci-workflows v0.76.0, with a step that fails the job on the
contract or draft output. The draft policy stays allow, and
treat-skipped-as is now set to pass explicitly: the old aggregate-results
step left it at that action's default, pass, while the composite's default
is fail. The job keeps if: always(). Concurrency already falls back to
github.run_id.

pr-section-drift read the check-contract pin from this workflow; it now
also accepts the report-ci-status pin, since that composite runs
check-contract at the commit it is pinned to.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Vcupoo79EqmECYFZ4MTv6C
@kyle-sexton
kyle-sexton marked this pull request as ready for review November 18, 2026 20:36
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 18, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-18T20:38:25.202269Z f5e1bfd Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@github-actions

Copy link
Copy Markdown

claude-review reviewed f5e1bfd3e5ba425cf57963d8316a6543debcd66a: 1 finding(s), 0 as inline comments.

Code review: PR #271 (ci-status onto report-ci-status)

I read the full diff and the PR context, and grepped the repository for other readers of the old steps. I did not fetch the upstream composite, so the claims about its inputs and outputs are author-claimed and unverified by me. These are yield-to-full-run: 'true', carry-forward-wait-seconds: '0', and the contract and draft outputs. I also did not run the tests or actionlint, so the Verification section's results are author-claimed.

What I checked, no defect found

  • CALLER_PIN_RE in .github/scripts/pr-section-drift.mjs:44 now matches check-contract|report-ci-status. The workflow has exactly one such uses: line. The aggregate-results sibling is still not matched, and the existing test covering that stays valid. The two added tests exercise the new pin and the mixed-SHA failure.
  • The fetch target is still check-contract/run.sh at the pinned SHA (UPSTREAM_GATE), as the new comment says.
  • check-pr-sections and the workflow comments agree with the new wiring.
  • The ci-status job keeps its if: always(), needs, permissions and timeout.
  • The new "Fail on the contract or draft policy" step uses !cancelled(). It fails closed on any output other than success, including an empty one, and it still runs when the composite step itself fails.
  • Behaviour preserved: treat-skipped-as: pass (made explicit), draft: allow, and the step name Aggregate lane results.

Finding (advisory, cross-file; no changed line can carry it)

  • README.md is the repository's canonical inventory, and it now describes the old wiring. Its lines 35-36 say the pull-request contract "is the check-contract step inside the ci-status job". After this PR no such step exists; check-contract runs inside the report-ci-status composite. README.md#L35-L36 should name report-ci-status.
  • Lines 39-40 say the comparison is against "the check-contract composite at the SHA ... pins". It is now the SHA the report-ci-status step is pinned to. README.md#L39-L40.
  • .github/PULL_REQUEST_TEMPLATE.md:17 and .claude/rules/pr-body-contract.md:3 use the same "check-contract step inside CI Status" phrasing. They are probably synced or inherited files, so the fix likely belongs upstream, not in this PR.
Advisory and manifest lines (0)

No pre-existing defects and no plugin-manifest changes.

Loosened-check verdict: fail (default; the prompt carried no loosened_check_verdict: or loosened_check_patterns: lines); patterns: 0. No loosening found. The explicit treat-skipped-as: pass and draft: allow match the prior behaviour, and the contract check still runs inside the composite. The decision-record line was absent, so the citation requirement was not checked. There is no closing issue ("No related issue"), so no acceptance criteria apply. The prompt supplied no settled-threads or prior-findings file, so nothing was dropped as settled and the review was not blocking-only.

Verifier dropped 0 of 1 candidates.

@github-actions

Copy link
Copy Markdown

claude-security-review reviewed f5e1bfd3e5ba425cf57963d8316a6543debcd66a: 0 finding(s), 0 as inline comments.

Security review: PR #271

Result: no security findings. critical-findings: 0

Scope. The PR touches three files. pr-require-checks.yml is a hold path (the ci-status hold steps). pr-section-drift.mjs and its test file are the other two. The change replaces the separate check-contract and aggregate-results steps with the single report-ci-status composite.

Trust-control read, ci-status job.

  • The new composite is pinned to a 40-hex SHA (ebd0e3bed99ae1365fcb4ef47ce97cfa745fcf2f, v0.76.0), in the same org's ci-workflows, so there is no unpinned or off-repo source.
  • The permissions: block is unchanged (actions: write, contents: read, pull-requests: write, statuses: write). The token scope is not widened.
  • The explicit token: ${{ github.token }} input is removed. I could not read the composite's action.yml (the fetch needed approval that wasn't granted), so I did not check its default token. The job's permissions: caps whatever token it uses.
  • The contract and draft verdicts still fail the job. The new step Fail on the contract or draft policy runs on !cancelled() && (contract != 'success' || draft != 'success'). An empty, renamed or missing output therefore fails closed. A composite failure fails the job directly.
  • The lane results input is unchanged: join(needs.*.result, ' '). The needs: roster is unchanged.
  • The old settings carry over per the PR's own comment, which cites the composite's action.yml lines. They are yield-to-full-run: 'true', carry-forward-wait-seconds: '0' and rerun-contract-only-siblings defaulting to true. I could not read them from the composite myself.
  • draft: allow is a no-op, because the workflow has no ready_for_review trigger. treat-skipped-as: pass preserves the old aggregation default.
  • The pull_request trigger and the fork handling are untouched. No expression injection or untrusted github context is introduced in run:.

Not verified. Whether report-ci-status at that SHA enforces the title and do-not-merge contract exactly as check-contract did. That depends on the composite's code, which the diff does not include. The step name is kept so contract-only runs can still find the writer step.

pr-section-drift.mjs and test. The regex now also accepts report-ci-status@<40-hex>. It still requires a 40-hex pin, and multiple distinct pins still error. The fetch path still resolves to check-contract/run.sh at that SHA. The lane is advisory and not in ci-status needs:. The new tests cover the two cases: a report-ci-status-only pin, and mixed pins at different SHAs. There is no injection or path surface.

Owner threat model. No named friction hold is weakened, and no token scope, secret, trusted actor or billing surface changes.

Instruction-surface and manifests. No instruction files or plugin manifests changed.

@kyle-sexton
kyle-sexton merged commit 896c81a into main Nov 18, 2026
19 checks passed
@kyle-sexton
kyle-sexton deleted the ci/report-ci-status-composite branch November 18, 2026 20:59
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