From 95b2a27e114ed0aac837f314b8145844f4bd5924 Mon Sep 17 00:00:00 2001 From: Matt Miller Date: Fri, 18 Sep 2026 01:00:54 +0000 Subject: [PATCH 1/2] ci(dependabot): ignore Comfy-Org/github-workflows reusables A caller of a Comfy-Org/github-workflows reusable pins it TWICE -- the `uses:` SHA and a `workflows_ref:` input that loads the matching briefs/scripts at run time. Dependabot only understands `uses:`: it rewrites the SHA and leaves `workflows_ref:` behind, splitting the pair. The workflow_sha equality guard in the reusables turns that split into a red check (open PR #871 is red on it right now; #832 was closed for the same reason). Both ignore entries are load-bearing: Dependabot names a reusable dependency by its FULL path, and a bare `dependency-name` is an exact match, so the exact form covers `owner/repo` and the `/*` form covers the per-file names. Deliberately not the single trailing-star form, which Dependabot expands to an unanchored `.*` that would also swallow future sibling repos whose names merely start with this one. The bump-*-callers fleet in github-workflows moves both pins together. --- .github/dependabot.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 42f5e7a62..4180f7509 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,16 @@ updates: ci-dependencies: patterns: - "*" + ignore: + # NEVER let Dependabot bump the Comfy-Org/github-workflows reusables: a caller + # pins them TWICE (`uses:` SHA + `workflows_ref:` input) and Dependabot only + # rewrites `uses:`, splitting the pair. The bump-*-callers fleet in + # github-workflows moves both pins together. Both entries are needed: + # Dependabot names a reusable by its FULL path, and a bare `dependency-name` + # is an exact match (the exact form covers `owner/repo`, the `/*` form the + # per-file names). Do NOT collapse to `Comfy-Org/github-workflows*`. + # + # Consequence for this repo: detect-unreviewed-merge.yml has no `workflows_ref` + # and no bumper fleet upstream, so its `uses:` pin is now bumped by hand. + - dependency-name: "Comfy-Org/github-workflows" + - dependency-name: "Comfy-Org/github-workflows/*" From 986f18dd8ed9c2c62be639fa38e0f0d520e7eb0e Mon Sep 17 00:00:00 2001 From: Matt Miller Date: Thu, 8 Oct 2026 05:36:24 +0000 Subject: [PATCH 2/2] ci(dependabot): correct detect-unreviewed-merge bumper claim, soften wildcard note Upstream's bump-detect-unreviewed-merge-callers fleet already bumps this repo's caller (see #978), so the ignore covers it to avoid racing that bumper rather than leaving it to a hand bump. Point the caller header at the bumper instead of Dependabot/Renovate, and explain the two-entry vs single-wildcard trade-off instead of forbidding upstream's form. Co-Authored-By: Claude Opus 5.5 --- .github/dependabot.yml | 16 ++++++++++------ .github/workflows/detect-unreviewed-merge.yml | 4 +++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4180f7509..d34c83722 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,12 +13,16 @@ updates: # NEVER let Dependabot bump the Comfy-Org/github-workflows reusables: a caller # pins them TWICE (`uses:` SHA + `workflows_ref:` input) and Dependabot only # rewrites `uses:`, splitting the pair. The bump-*-callers fleet in - # github-workflows moves both pins together. Both entries are needed: - # Dependabot names a reusable by its FULL path, and a bare `dependency-name` - # is an exact match (the exact form covers `owner/repo`, the `/*` form the - # per-file names). Do NOT collapse to `Comfy-Org/github-workflows*`. + # github-workflows moves both pins together. Dependabot names a reusable by + # its FULL path, and a bare `dependency-name` is an exact match, so the exact + # form covers `owner/repo` and the `/*` form the per-file names. Upstream's + # own config uses the single `Comfy-Org/github-workflows*`, which also works; + # the two-entry form is preferred here because Dependabot's `*` is unanchored + # and a lone trailing star would also match any sibling repo whose name + # merely starts with `github-workflows`. # - # Consequence for this repo: detect-unreviewed-merge.yml has no `workflows_ref` - # and no bumper fleet upstream, so its `uses:` pin is now bumped by hand. + # detect-unreviewed-merge.yml pins once (no `workflows_ref`), but it is + # deliberately covered too: upstream's bump-detect-unreviewed-merge-callers + # fleet already bumps it here, and a second bumper would only race it. - dependency-name: "Comfy-Org/github-workflows" - dependency-name: "Comfy-Org/github-workflows/*" diff --git a/.github/workflows/detect-unreviewed-merge.yml b/.github/workflows/detect-unreviewed-merge.yml index fbc60c70c..3a1803ac4 100644 --- a/.github/workflows/detect-unreviewed-merge.yml +++ b/.github/workflows/detect-unreviewed-merge.yml @@ -16,7 +16,9 @@ # # Pin to a full commit SHA with the version as a trailing comment — bare # tag refs (e.g. @v1) fail pin-validation checks (pinact, zizmor) in -# stricter repos. Bump the SHA via Dependabot/Renovate. +# stricter repos. In this repo the SHA is bumped by the upstream +# bump-detect-unreviewed-merge-callers fleet; Dependabot ignores it (see +# .github/dependabot.yml). name: Detect Unreviewed Merge