Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/automerge-dependabot/queue.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use strict";

// The scheduled path: queue each open Dependabot pull request that passes
// gate.cjs's gate and whose head has a green ci-status. A GITHUB_TOKEN arm
// gate.cjs's gate and whose head has a green CI Status. A GITHUB_TOKEN arm
// never enters a merge queue, so the arm uses the melodic-release App token
// (`app`); every read uses the job token (`github`), since the App holds no
// checks permission. Out-of-tier pull requests are left alone and noted, and
Expand Down Expand Up @@ -46,7 +46,7 @@ function readLockedRuntime(workspace, lockfile) {
}
}

const CI_STATUS = "ci-status";
const CI_STATUS = "CI Status";
const MISSING_WORKFLOWS = /without `?workflows`? permission/iu;
const ALREADY_MERGEABLE = /is in (clean|unstable) status/iu;

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/pr-require-checks/check-contract/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# pr-contract

One composite step carrying the whole pull-request contract, so a consumer needs
one required status check (`ci-status`) instead of four.
one required status check (`CI Status`) instead of four.

| Check | Outcome |
|---|---|
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
updates:
# Keep SHA-pinned actions current. pr-automerge-dependabot-queue.yml queues
# patch and minor bumps of the standards dependabot-policy publishers
# (actions/*, github/*, anthropics/*) once ci-status passes. Every other PR
# (actions/*, github/*, anthropics/*) once CI Status passes. Every other PR
# waits for a person: melodic-software callers float on this repository's
# main, so a merged bump runs next in their secret-holding lanes. The "/"
# target scans .github/workflows; the glob target is required to also scan
Expand Down
26 changes: 2 additions & 24 deletions .github/scripts/ci-fanout-consolidation.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,6 @@ const jobCondition = (block) => /^ {4}if: (.*)$/mu.exec(block)?.[1] ?? "";
// that ran there would have no pull request to check, and `ci-status` would
// publish a verdict for an issue.
const ISSUE_JOB = "intake-label-needs-triage";
// Mirrors the ci-status conclusion under the old check name; like ci-status,
// it must run on contract-only events, so it carries no contract-only gate.
const MIRROR_JOB = "report-ci-status";

test("only the issue labeler runs on an issues event", () => {
assert.match(ciWorkflow, /^ {2}issues:\n {4}types: \[opened, reopened\]$/mu);
Expand Down Expand Up @@ -240,12 +237,7 @@ test("every job except ci-status and the issue labeler carries the contract-only
const ungated = [];
for (const block of jobBlocks) {
const name = jobName(block);
if (
name === undefined ||
name === "ci-status" ||
name === MIRROR_JOB ||
name === ISSUE_JOB
) {
if (name === undefined || name === "ci-status" || name === ISSUE_JOB) {
continue;
}
if (!jobCondition(block).includes(CONTRACT_ONLY_GATE)) {
Expand All @@ -257,15 +249,6 @@ test("every job except ci-status and the issue labeler carries the contract-only
const ciStatusBlock = jobBlocks.find((block) => /^ci-status:$/mu.test(block));
assert.ok(ciStatusBlock !== undefined);
assert.ok(!ciStatusBlock.includes(CONTRACT_ONLY_GATE));
const mirrorBlock = jobBlocks.find((block) =>
new RegExp(`^${MIRROR_JOB}:$`, "mu").test(block),
);
assert.ok(mirrorBlock !== undefined);
assert.ok(!mirrorBlock.includes(CONTRACT_ONLY_GATE));
assert.match(
mirrorBlock,
/^ {4}if: \$\{\{ github\.event_name != 'issues' && always\(\) \}\}$/mu,
);
});

test("the ci-status contract-only default matches every job gate", () => {
Expand All @@ -288,12 +271,7 @@ test("the ci-status contract-only default matches every job gate", () => {
let compared = 0;
for (const block of jobBlocks) {
const name = jobName(block);
if (
name === undefined ||
name === "ci-status" ||
name === MIRROR_JOB ||
name === ISSUE_JOB
) {
if (name === undefined || name === "ci-status" || name === ISSUE_JOB) {
continue;
}
const body = /^ {4}if: \$\{\{ (?<body>.*) \}\}$/mu.exec(block)?.groups
Expand Down
8 changes: 4 additions & 4 deletions .github/scripts/pr-automerge-dependabot-queue.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ async function runWithFakes({
if (route === github.rest.pulls.listCommits)
return commits[params.pull_number] ?? [dependabotCommit(GROUP_MESSAGE)];
if (route === github.rest.checks.listForRef) {
assert.equal(params.check_name, "ci-status");
assert.equal(params.check_name, "CI Status");
assert.equal(params.ref, HEAD);
return checkRuns[params.ref] ?? [success];
}
Expand Down Expand Up @@ -362,7 +362,7 @@ test("a synced policy path that cannot be read leaves pull requests alone and di
);
});

test("an in-tier group with a green ci-status is queued at its head with the App token", async () => {
test("an in-tier group with a green CI Status is queued at its head with the App token", async () => {
const { counts, appCalls, warnings } = await runWithFakes();
assert.deepEqual(counts, { queued: 1, skipped: 0, failed: 0 });
assert.deepEqual(warnings, []);
Expand Down Expand Up @@ -526,15 +526,15 @@ for (const [label, runs, shown] of [
"failure",
],
]) {
test(`a ci-status that is ${label} on the head skips the pull request`, async () => {
test(`a CI Status that is ${label} on the head skips the pull request`, async () => {
const { counts, appCalls, notices } = await runWithFakes({
checkRuns: { [HEAD]: runs },
});
assert.deepEqual(counts, { queued: 0, skipped: 1, failed: 0 });
assert.equal(appCalls.length, 0);
assert.match(
notices[0],
new RegExp(`#7 not queued yet: ci-status on ${HEAD} is ${shown}`, "u"),
new RegExp(`#7 not queued yet: CI Status on ${HEAD} is ${shown}`, "u"),
);
});
}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-automerge-dependabot-queue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: PR Automerge Dependabot Queue
#
# Per open pull request authored by account 49699333 (dependabot[bot]): the
# gate pr-automerge-dependabot.yml runs (automerge-dependabot/gate.cjs) over
# the head commit's Dependabot metadata, then a `ci-status` check run that
# the head commit's Dependabot metadata, then a `CI Status` check run that
# succeeded on the head, then enablePullRequestAutoMerge at that head with no
# merge method (the queue sets it), which enqueues it once it is mergeable.
# An out-of-tier pull request is left alone with a notice, and disarmed if an
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
permissions:
contents: read # Check out main for the gate scripts.
pull-requests: read # List the pull requests and their commits; read the merge-queue state.
checks: read # Read ci-status on each head; the App holds no checks permission.
checks: read # Read CI Status on each head; the App holds no checks permission.
steps:
- name: Check out
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-automerge-dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: PR Automerge Dependabot
# Reusable workflow: arms GitHub auto-merge (squash) on a Dependabot pull
# request whose every update is a patch or minor bump of an allowlisted GitHub
# Actions publisher or of an npm, pip, uv or NuGet package. Arming never merges: GitHub merges once every required check,
# `ci-status` included, passes. Nothing here calls a merge mutation, so this
# `CI Status` included, passes. Nothing here calls a merge mutation, so this
# workflow cannot bypass the required check. A repository without a required
# check makes GitHub refuse the arm (the pull request is already mergeable),
# and the job fails rather than merging. A GITHUB_TOKEN arm never enters a
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/pr-require-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -747,9 +747,6 @@ jobs:
if: ${{ !cancelled() }}
uses: $/.github/actions/pr-require-checks/aggregate-results
with:
# report-ci-status mirrors this gate under `ci-status` and runs on
# contract-only events too; the run-shape reads must ignore it.
alias-jobs: ci-status
# While a full run on the SHA is in flight a contract-only run holds,
# up to `yield-wait-seconds`, with its check run in progress, then
# passes only on a `success` recorded since it started. The ceiling is this
Expand All @@ -765,18 +762,3 @@ jobs:
# how many steps of the job are in progress.
step-name: Aggregate lane results
results: ${{ needs.detect-changes.result }} ${{ needs.pr-run-checks.result }} ${{ needs.psscriptanalyzer.result }} ${{ needs.check-markdown-references.result }} ${{ needs.ruff.result }} ${{ needs.pyright.result }} ${{ needs.biome.result }} ${{ needs.dotnet-build.result }} ${{ needs.dotnet-format.result }} ${{ needs.shellcheck.result }} ${{ needs.shfmt.result }} ${{ needs.test-contracts.result }} ${{ needs.actionlint.result }} ${{ needs.jsonschema.result }} ${{ needs.check-action-filename.result }} ${{ needs.check-workflow-naming.result }} ${{ needs.pr-run-checks-go.result }} ${{ needs.pr-audit-workflows.result }} ${{ needs.pr-scan-dependencies.result }}

report-ci-status:
name: ci-status
needs: [ci-status]
if: ${{ github.event_name != 'issues' && always() }}
runs-on: ubuntu-24.04
timeout-minutes: 3
permissions: {}
steps:
- name: Report the conclusion of `CI Status`
env:
RESULT: ${{ needs.ci-status.result }}
run: |
echo "CI Status: $RESULT"
[ "$RESULT" = success ]
2 changes: 1 addition & 1 deletion .github/workflows/pr-review-security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ name: PR Review Security
# The usage-limit fallback works as in pr-review.yml, with lane name `Claude
# security review` and the 13-minute step budget. The
# check is advisory (github-iac ADR 0011 keeps agentic review
# advisory, and `ci-status` is the only required check); do not make it
# advisory, and `CI Status` is the only required check); do not make it
# required.

on:
Expand Down
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ Each line names a rule CI does not enforce; the linked file states it in full.
[rule](README.md#policy-ownership-and-action-inputs).
- Local-lane guard wrappers keep parity with the standards component:
[rule](README.md#actions).
- Lanes consolidate as composite actions; `ci-status` stays the single required check:
- Lanes consolidate as composite actions; `CI Status` stays the single required check:
[rule](README.md#contract).
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ checkout of this repo. (Public is required because a public consumer such as
checksum-verified install URLs) have no package manifest it can track, so
bumping one is a reviewed pull request in this repository.
- **Each consumer aggregates locally.** One action runs one tool inside a
consumer job. The required-check contract is a single check named `ci-status`,
produced by a thin gateway job the consumer keeps local so the required-check
consumer job. The required-check contract is a single check named `CI Status`,
produced by a thin gateway job (`ci-status`) the consumer keeps local so the required-check
name stays un-nested. The gateway `needs:` the lane jobs and fails if any
failed or was cancelled. Whether a skipped lane passes is the consumer's
policy via the `ci-status` action's `treat-skipped-as` input — see that
Expand Down Expand Up @@ -1209,7 +1209,7 @@ GitHub continues the normal weekly patching of each hosted image generation.
```

- `.github/workflows/pr-automerge-dependabot.yml` — arms squash auto-merge on a
Dependabot pull request, so GitHub merges it once `ci-status` and every other
Dependabot pull request, so GitHub merges it once `CI Status` and every other
required check pass. It never merges directly. All gates must hold: the PR
author and the event sender are account id `49699333` (dependabot[bot]);
fetch-metadata succeeded; every update is `github_actions` or, unless the
Expand Down Expand Up @@ -1273,7 +1273,7 @@ GitHub continues the normal weekly patching of each hosted image generation.
commit's Dependabot metadata, runs the same gate with the reusable's
default inputs (a synced dependabot-policy copy in the checked-out main
would set the publishers the same way; this repository has none yet), and
requires a `ci-status` check run that succeeded on the head. Every package
requires a `CI Status` check run that succeeded on the head. Every package
`check-dependabot-policy/package-lock.json` installs, transitive ones
included, is review-only, since consumers run that checker. It then arms each passing PR with the melodic-release App token from
the `plugin-release` environment, at the verified head and with no merge
Expand Down
Loading