diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 42f5e7a62..d34c83722 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,20 @@ 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. 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`. + # + # 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