From 2ec0f5e61f32cb87bd959a13a24f287cb11d166f Mon Sep 17 00:00:00 2001 From: Kyle Sexton <153232337+kyle-sexton@users.noreply.github.com> Date: Mon, 16 Nov 2026 11:49:21 -0500 Subject: [PATCH 1/2] ci(dependabot): let Dependabot bump the ci-workflows action pins pr-require-checks.yml pins every ci-workflows composite action at the v0.74.0 release. No input the workflow passes was removed and no new input is required. dependabot.yml now proposes ci-workflows bumps in one first-party-actions group with no cooldown, and ignores only the check-managed-files pin that the standards sync owns. The header comments in dependabot.yml and pr-automerge-dependabot.yml state that the auto-merge lane arms minor and patch bumps of melodic-software/* once the synced Dependabot policy copy is present. The ecosystem records cite the v0.74.0 composite defaults, including the kjanat/actionlint 1.17.0 fork and markdownlint-cli2 0.23.3, and the README describes the new Dependabot coverage. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01MWmASQ4Dwyfvm2NoX2QpJD --- .claude/ecosystems/bash.yaml | 2 +- .claude/ecosystems/cross-cutting.yaml | 4 +-- .claude/ecosystems/markdown.yaml | 8 ++--- .claude/ecosystems/yaml.yaml | 6 ++-- .github/dependabot.yml | 30 +++++++++++++------ .github/workflows/pr-automerge-dependabot.yml | 7 +++-- .github/workflows/pr-require-checks.yml | 30 +++++++++---------- README.md | 5 ++-- 8 files changed, 54 insertions(+), 38 deletions(-) diff --git a/.claude/ecosystems/bash.yaml b/.claude/ecosystems/bash.yaml index 015ef8d..8fd13cf 100644 --- a/.claude/ecosystems/bash.yaml +++ b/.claude/ecosystems/bash.yaml @@ -2,7 +2,7 @@ # https://github.com/melodic-software/claude-code-plugins/tree/main/docs/contracts/ecosystem-commands # shellcheck with the root .shellcheckrc and no severity filter, as CI's # shellcheck lane runs it (.github/workflows/pr-require-checks.yml:294-307 calls -# the ci-workflows shellcheck composite @594987a, whose run.sh passes +# the ci-workflows shellcheck composite at v0.74.0, whose run.sh:172-175 passes # --rcfile and leaves --severity unset). Commands run from the repository root. enabled: true globs: ["*.sh", "*.bash"] diff --git a/.claude/ecosystems/cross-cutting.yaml b/.claude/ecosystems/cross-cutting.yaml index 8ed9f09..98a7dd7 100644 --- a/.claude/ecosystems/cross-cutting.yaml +++ b/.claude/ecosystems/cross-cutting.yaml @@ -3,7 +3,7 @@ # Lint-only: /toolchain:lint runs it, /toolchain:check does not. CI's typos, # editorconfig-checker, gitleaks and check-links lanes # (.github/workflows/pr-require-checks.yml:104-196), each with its root config -# as the ci-workflows composites @594987a pass it. typos checks "." and then the +# as the ci-workflows composites at v0.74.0 pass it. typos checks "." and then the # hidden tracked files by name, as the typos lane's second step does (:118-141). # lychee gets CI's three globs (:193-196). Every check runs and any failure # fails the command, as CI's ci-status gate fails on any lane. Commands run @@ -37,4 +37,4 @@ tool-pin: editorconfig-checker: "4.0.2" lychee: "0.24.2" gates: [] -notes: "Lint-only: owned by /toolchain:lint. Pins are the composite defaults at 594987a (actions/typos/action.yml:46, actions/gitleaks/action.yml:50 with scan.sh:136 for the dir-mode flags, actions/editorconfig-checker/action.yml:35, actions/lychee-offline/action.yml:19). .cursor/install.sh pins older versions of typos, editorconfig-checker and check-jsonschema; these pins follow CI. CI's check-line-endings lane (pr-require-checks.yml:309-320) re-stages the whole index with git add --renormalize, so it has no read-only local command here; bash .cursor/check.sh runs a safe copy of it." +notes: "Lint-only: owned by /toolchain:lint. Pins are the composite defaults at v0.74.0 (actions/typos/action.yml:46, actions/gitleaks/action.yml:52 with scan.sh:136 for the dir-mode flags, actions/editorconfig-checker/action.yml:35, actions/lychee-offline/action.yml:22). .cursor/install.sh pins older versions of typos, editorconfig-checker, check-jsonschema and markdownlint-cli2, and rhysd/actionlint where CI installs the kjanat/actionlint fork; these pins follow CI. CI's check-line-endings lane (pr-require-checks.yml:309-320) re-stages the whole index with git add --renormalize, so it has no read-only local command here; bash .cursor/check.sh runs a safe copy of it." diff --git a/.claude/ecosystems/markdown.yaml b/.claude/ecosystems/markdown.yaml index 02528aa..e0150bb 100644 --- a/.claude/ecosystems/markdown.yaml +++ b/.claude/ecosystems/markdown.yaml @@ -2,7 +2,7 @@ # https://github.com/melodic-software/claude-code-plugins/tree/main/docs/contracts/ecosystem-commands # markdownlint-cli2 with the root config, as CI's markdownlint lane runs it # (.github/workflows/pr-require-checks.yml:89-102 calls the ci-workflows -# markdownlint composite @594987a, which runs markdownlint-cli2 0.23.2 with +# markdownlint composite at v0.74.0, which runs markdownlint-cli2 0.23.3 with # --config .markdownlint-cli2.jsonc). Run from PATH; no command here installs # anything. Commands run from the repository root. enabled: true @@ -14,8 +14,8 @@ check-cmd: 'markdownlint-cli2 --config "$REPO_ROOT/.markdownlint-cli2.jsonc" ' code-fix-cmd: null opt-in: ".markdownlint-cli2.jsonc at the repository root" -install-hint: "npm i -g markdownlint-cli2@0.23.2 (the version CI runs) puts it on PATH" +install-hint: "npm i -g markdownlint-cli2@0.23.3 (the version CI runs) puts it on PATH" tool-pin: - markdownlint-cli2: "0.23.2" + markdownlint-cli2: "0.23.3" gates: [] -notes: "CI runs npx --yes markdownlint-cli2@0.23.2 over every **/*.md; this record runs the PATH binary over the changed files only, so it never downloads." +notes: "CI runs npx --yes markdownlint-cli2@0.23.3 over every **/*.md; this record runs the PATH binary over the changed files only, so it never downloads." diff --git a/.claude/ecosystems/yaml.yaml b/.claude/ecosystems/yaml.yaml index 98a2720..0a5e960 100644 --- a/.claude/ecosystems/yaml.yaml +++ b/.claude/ecosystems/yaml.yaml @@ -26,10 +26,10 @@ fix-cmd: null code-fix-cmd: null opt-in: "GitHub Actions workflows present" install-hint: | - actionlint: rhysd/actionlint 1.7.12 from https://github.com/rhysd/actionlint/releases (the release CI's actionlint composite installs) + actionlint: kjanat/actionlint 1.17.0 from https://github.com/kjanat/actionlint/releases (the fork and release CI's actionlint composite installs; its version numbers overlap rhysd/actionlint's, so take it from that fork) check-jsonschema: uv tool install check-jsonschema==0.38.2 tool-pin: - actionlint: "1.7.12" + actionlint: "1.17.0" check-jsonschema: "0.38.2" gates: [] -notes: "Lint-only: owned by /toolchain:lint. Pins are the ci-workflows composite defaults at the SHA CI calls, 594987a (actions/actionlint/action.yml:20, actions/check-jsonschema/action.yml:39). The Claude settings check fetches its schema from json.schemastore.org, as CI does, so it needs the network. CI also runs two advisory drift lanes, check-pr-sections and check-issue-forms (pr-require-checks.yml:329-364); their tests are typescript.yaml's test-cmd, and their comparison scripts are not run here because CI does not gate on them." +notes: "Lint-only: owned by /toolchain:lint. Pins are the ci-workflows composite defaults at the release CI calls, v0.74.0 (actions/actionlint/action.yml:25 with :67 for the kjanat/actionlint download, actions/check-jsonschema/action.yml:39). The kjanat fork accepts `$/` refs and `concurrency.queue`, which rhysd/actionlint 1.7.12 rejects (actions/actionlint/action.yml:18-19). The Claude settings check fetches its schema from json.schemastore.org, as CI does, so it needs the network. CI also runs two advisory drift lanes, check-pr-sections and check-issue-forms (pr-require-checks.yml:329-364); their tests are typescript.yaml's test-cmd, and their comparison scripts are not run here because CI does not gate on them." diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f3e507b..357867e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,9 +1,12 @@ version: 2 updates: - # Keep the SHA-pinned actions in this repo's workflows current. Merge lanes - # follow the standards dependabot-policy component: the `vendor-actions` - # group (non-major only) is the auto-merge lane armed by - # pr-automerge-dependabot.yml; every other PR is reviewed by hand. This repo + # Keep the SHA-pinned actions in this repo's workflows current, the + # melodic-software/ci-workflows composite-action pins included. Merge lanes + # follow the standards dependabot-policy component: pr-automerge-dependabot.yml + # arms auto-merge on minor and patch bumps in the `vendor-actions` group and, + # once the synced policy copy is at + # .github/standards/dependabot-policy/policy.json, on minor and patch bumps of + # `melodic-software/*`; every other bump takes the review tier. This repo # carries no composite actions of its own, so the single "/" target (which # scans .github/workflows) is sufficient. - package-ecosystem: github-actions @@ -19,7 +22,21 @@ updates: # SHA-rewrite supply-chain risk that motivates SHA-pinning. cooldown: default-days: 3 + # First-party releases take no soak (the synced Dependabot policy's + # `fastTrack.own`). + exclude: + - "melodic-software/ci-workflows/*" + # The one first-party pin Dependabot leaves alone sits in the sync-managed + # pr-check-managed-files-hosted.yml, which the standards sync owns. + ignore: + - dependency-name: "melodic-software/ci-workflows/.github/actions/check-managed-files" groups: + # Every ci-workflows composite-action pin moves in one pull request, so + # the repository stays on one ci-workflows release. + first-party-actions: + patterns: + - melodic-software/* + # Listed before the catch-all group so it wins. vendor-actions: patterns: - actions/* @@ -29,8 +46,3 @@ updates: github-actions: patterns: - '*' - # ci-workflows composites move by hand so the fleet stays on one - # ci-workflows SHA; a bump to an unreviewed SHA fails the Runner policy - # contract fleet-wide. See melodic-software/github-iac#378. - ignore: - - dependency-name: "melodic-software/ci-workflows/*" diff --git a/.github/workflows/pr-automerge-dependabot.yml b/.github/workflows/pr-automerge-dependabot.yml index 6e7d055..2163afe 100644 --- a/.github/workflows/pr-automerge-dependabot.yml +++ b/.github/workflows/pr-automerge-dependabot.yml @@ -2,8 +2,11 @@ name: PR Automerge Dependabot # Thin caller of the org's reusable that arms GitHub auto-merge (squash) on a # Dependabot pull request bumping only allowlisted GitHub Actions publishers -# (`actions/*`, `github/*`, `anthropics/*`) by a patch or minor version. Arming -# never merges: GitHub merges once every required check, `CI Status` included, +# (`actions/*`, `github/*`, `anthropics/*`) by a patch or minor version. When +# the base commit holds the synced standards Dependabot policy copy at +# `.github/standards/dependabot-policy/policy.json`, the reusable reads its +# allowlist from that copy, which also arms the organization's own releases +# (`melodic-software/*`). Arming never merges: GitHub merges once every required check, `CI Status` included, # passes. The caller owns the trigger, concurrency and the permission grant; a # called workflow can only downgrade the caller's grant. Runs on the # GitHub-hosted `ubuntu-24.04` runner, which the runner-policy admits on a diff --git a/.github/workflows/pr-require-checks.yml b/.github/workflows/pr-require-checks.yml index 86b473f..305cf9d 100644 --- a/.github/workflows/pr-require-checks.yml +++ b/.github/workflows/pr-require-checks.yml @@ -97,7 +97,7 @@ jobs: with: persist-credentials: false - name: Lint Markdown - uses: melodic-software/ci-workflows/.github/actions/markdownlint@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/markdownlint@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: config: .markdownlint-cli2.jsonc @@ -112,7 +112,7 @@ jobs: with: persist-credentials: false - name: Spell-check - uses: melodic-software/ci-workflows/.github/actions/typos@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/typos@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: config: _typos.toml - name: Spell-check hidden tracked paths @@ -152,7 +152,7 @@ jobs: with: persist-credentials: false - name: Check editorconfig conformance - uses: melodic-software/ci-workflows/.github/actions/editorconfig-checker@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/editorconfig-checker@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: config: .editorconfig-checker.json @@ -167,7 +167,7 @@ jobs: with: persist-credentials: false - name: Scan for secrets - uses: melodic-software/ci-workflows/.github/actions/gitleaks@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/gitleaks@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: config: .gitleaks.toml @@ -182,7 +182,7 @@ jobs: with: persist-credentials: false - name: Check links and anchors (offline) - uses: melodic-software/ci-workflows/.github/actions/lychee-offline@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/lychee-offline@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: config: lychee.toml # The action's default `**/*.md` skips hidden directories, so Markdown @@ -206,7 +206,7 @@ jobs: with: persist-credentials: false - name: Lint workflows - uses: melodic-software/ci-workflows/.github/actions/actionlint@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/actionlint@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 jsonschema: name: Jsonschema @@ -219,12 +219,12 @@ jobs: with: persist-credentials: false - name: Validate dependabot.yml - uses: melodic-software/ci-workflows/.github/actions/check-jsonschema@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/check-jsonschema@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: builtin-schema: vendor.dependabot files: .github/dependabot.yml - name: Validate workflows - uses: melodic-software/ci-workflows/.github/actions/check-jsonschema@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/check-jsonschema@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: builtin-schema: vendor.github-workflows files: .github/workflows/*.yml @@ -264,12 +264,12 @@ jobs: fi echo "files=${forms[*]}" >> "$GITHUB_OUTPUT" - name: Validate issue forms - uses: melodic-software/ci-workflows/.github/actions/check-jsonschema@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/check-jsonschema@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: builtin-schema: vendor.github-issue-forms files: ${{ steps.issue-forms.outputs.files }} - name: Validate issue-template chooser config - uses: melodic-software/ci-workflows/.github/actions/check-jsonschema@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/check-jsonschema@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: builtin-schema: vendor.github-issue-config files: .github/ISSUE_TEMPLATE/config.yml @@ -279,7 +279,7 @@ jobs: # breaking schemastore change reddens the lane without this repo changing; # swap to a builtin if one ever ships. - name: Validate Claude Code settings - uses: melodic-software/ci-workflows/.github/actions/check-jsonschema@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/check-jsonschema@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: schemafile: https://json.schemastore.org/claude-code-settings.json files: .claude/settings.json @@ -302,7 +302,7 @@ jobs: with: persist-credentials: false - name: Lint shell scripts - uses: melodic-software/ci-workflows/.github/actions/shellcheck@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/shellcheck@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: rcfile: .shellcheckrc @@ -317,7 +317,7 @@ jobs: with: persist-credentials: false - name: Check index-level EOL drift - uses: melodic-software/ci-workflows/.github/actions/check-line-endings@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/check-line-endings@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 # Compares `.github/PULL_REQUEST_TEMPLATE.md` headings and # `docs/conventions/source-control.yaml`'s `pr_body_required_sections` to the @@ -386,7 +386,7 @@ jobs: statuses: write steps: - name: Check the pull-request contract - uses: melodic-software/ci-workflows/.github/actions/pr-require-checks/check-contract@594987abe8657a40bccc13d301f1f0d5cccb5348 # v0.39.8 + uses: melodic-software/ci-workflows/.github/actions/pr-require-checks/check-contract@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: token: ${{ github.token }} - name: Aggregate lane results @@ -394,7 +394,7 @@ jobs: # aggregation: the job still fails on the contract step's exit code, and # the `ci-lanes` status is on the SHA for the next contract-only run. if: ${{ !cancelled() }} - uses: melodic-software/ci-workflows/.github/actions/pr-require-checks/aggregate-results@ac4d8780de793b20e60a66890e767df579c80d83 # ac4d878 2026-11-11 + uses: melodic-software/ci-workflows/.github/actions/pr-require-checks/aggregate-results@944d346c487c79eaf85dff752586fb59b0f5c539 # v0.74.0 with: # Derived from `needs:` rather than restating it. Hand-listing the # results let a lane be dropped from this input alone: still gated via diff --git a/README.md b/README.md index bd63881..fb6db17 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,9 @@ link lane for the same reason. SHA `.github/workflows/pr-require-checks.yml` pins. The `check-issue-forms` lane (`.github/scripts/issue-form-drift.mjs` and its tests) compares the issue forms to the synced contract. - `.github/dependabot.yml` keeps `actions/checkout` current; the `ci-workflows` - pins move by hand (see its `ignore` block). + `.github/dependabot.yml` keeps the action pins current, the `ci-workflows` + composite-action pins included, all in one `first-party-actions` group; it + ignores only the `check-managed-files` pin, which the standards sync owns. - Give every action pin a `# vX.Y.Z` tag comment. Standards' pin-comment convention also permits a short-sha-and-date fallback, but Dependabot reads the current version out of that comment, so the fallback From fac9b2d110bc6e6775a716b1dbc4d9d5e8aac460 Mon Sep 17 00:00:00 2001 From: Kyle Sexton <153232337+kyle-sexton@users.noreply.github.com> Date: Mon, 16 Nov 2026 11:50:01 -0500 Subject: [PATCH 2/2] style(ci): wrap the auto-merge caller header comment Co-Authored-By: Claude Fable 5.2 Claude-Session: https://claude.ai/code/session_01MWmASQ4Dwyfvm2NoX2QpJD --- .github/workflows/pr-automerge-dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-automerge-dependabot.yml b/.github/workflows/pr-automerge-dependabot.yml index 2163afe..1b79e25 100644 --- a/.github/workflows/pr-automerge-dependabot.yml +++ b/.github/workflows/pr-automerge-dependabot.yml @@ -6,8 +6,8 @@ name: PR Automerge Dependabot # the base commit holds the synced standards Dependabot policy copy at # `.github/standards/dependabot-policy/policy.json`, the reusable reads its # allowlist from that copy, which also arms the organization's own releases -# (`melodic-software/*`). Arming never merges: GitHub merges once every required check, `CI Status` included, -# passes. The caller owns the trigger, concurrency and the permission grant; a +# (`melodic-software/*`). Arming never merges: GitHub merges once every +# required check, `CI Status` included, passes. The caller owns the trigger, concurrency and the permission grant; a # called workflow can only downgrade the caller's grant. Runs on the # GitHub-hosted `ubuntu-24.04` runner, which the runner-policy admits on a # public repository.