Skip to content

ci(dependabot): ignore Comfy-Org/github-workflows so Dependabot cannot split a caller's pins - #889

Merged
mattmillerai merged 2 commits into
mainfrom
matt/be-15272-dependabot-ignore-github-workflows
Nov 17, 2026
Merged

mattmillerai merged 2 commits into
mainfrom
matt/be-15272-dependabot-ignore-github-workflows

Conversation

@mattmillerai

@mattmillerai mattmillerai commented Sep 18, 2026 •

Copy link
Copy Markdown
Member

ELI5

Some of our automated checks reuse shared check scripts, and each one records which version of those scripts to use in two separate places. The automatic dependency updater only knows how to change one of the two, so its updates left the two out of step and broke the checks. This tells the updater to stay away from those shared scripts. The tool that already updates them properly changes both places at once.

Description

Adds an ignore: block to the existing github-actions entry in
.github/dependabot.yml. No other Dependabot setting is touched. It also updates the
header comment in .github/workflows/detect-unreviewed-merge.yml, which used to say
"Bump the SHA via Dependabot/Renovate", so that it names the upstream bumper.

- dependency-name: "Comfy-Org/github-workflows"
- dependency-name: "Comfy-Org/github-workflows/*"

Both entries are load-bearing. Dependabot names a reusable-workflow dependency by
its full path (Comfy-Org/github-workflows/.github/workflows/groom.yml) — one
dependency per reusable, not one per repo — and a dependency-name without a wildcard
is an exact match. The exact form covers the owner/repo spelling, the /* form
covers the per-file names. This mirrors Comfy-Org/cloud's config, where the
first cut was the bare Comfy-Org/github-workflows alone and matched nothing.

This repo uses two entries rather than upstream's single Comfy-Org/github-workflows*
(which also works). The reason: Dependabot expands *
to an unanchored .*, so one trailing star would also swallow any future sibling repo
whose name merely starts with this one. That same unanchored .* is why owner/repo/*
still matches the full paths — it spans / happily.

This repo calls five of these reusables: agents-md-integrity.yml,
ci-cursor-review.yml, groom.yml, public-repo-hygiene.yml,
detect-unreviewed-merge.yml.

Why now — the capability being denied was attempted, and it breaks

This diff removes a capability (Dependabot bumping these five reusables), so here is
the evidence it genuinely fails rather than an assumption that it would:

PR #871 was the live attempt (since closed unmerged on 2026-09-19). Dependabot ran, and its diff did this:

-  uses: .../agents-md-integrity.yml@c6b3eff...  # github-workflows main (c6b3eff)
+  uses: .../agents-md-integrity.yml@425c154...  # github-workflows main (c6b3eff)
-  uses: .../groom.yml@4efe4c5...                # main @ 4efe4c5
+  uses: .../groom.yml@425c154...                # main @ 4efe4c5
-  uses: .../public-repo-hygiene.yml@3b2c8ca...  # github-workflows main (3b2c8ca)
+  uses: .../public-repo-hygiene.yml@425c154...  # github-workflows main (3b2c8ca)

Three distinct, deliberate per-workflow pins flattened onto one SHA; every
workflows_ref: input left behind at its old value; and every explanatory
# main @ <sha> comment left pointing at the value it no longer matches. The
hygiene / public-repo-hygiene check on #871 failed as a direct result.
PR #832 was closed unmerged for the same reason on 2026-09-13.

The path that does work is not removed, and this PR redirects to it. The
bump-*-callers fleet in github-workflows rewrites both pins together and opens the
PR itself, so these reusables keep getting bumped — just by the mechanism that
understands the second pin. That includes detect-unreviewed-merge.yml, which pins only
once: upstream's bump-detect-unreviewed-merge-callers fleet already bumps it in this
repo (#978), so ignoring it in Dependabot avoids a second bumper racing that one.

How has this been tested?

Acceptance was run against the artifacts named for this change, not only the file the
diff touches:

  • Diff scope — git diff --stat origin/main...HEAD → .github/dependabot.yml | 17 +
    and .github/workflows/detect-unreviewed-merge.yml | 4 +- (header comment only);
    2 files, 20 insertions, 1 deletion.
  • Parses — python3 -c "import yaml; yaml.safe_load(open('.github/dependabot.yml'))"
    → OK. The parsed tree shows ignore as exactly two dependency-name mappings,
    alongside an unchanged version, package-ecosystem, directory, schedule,
    open-pull-requests-limit and groups.
  • The two entries — grep -n 'Comfy-Org/github-workflows' .github/dependabot.yml
    returns four lines: the two dependency-name: entries (L27, L28) plus two
    explanatory comment lines (L13, L19) that also spell the repo name. Exactly two
    entries, as intended; flagging the comment hits so the grep output isn't a surprise.
  • The five callers — all five are present and each calls a github-workflows
    reusable. Four of five (agents-md-integrity, ci-cursor-review, groom,
    public-repo-hygiene) carry a workflows_ref: input, i.e. the double pin this
    protects. detect-unreviewed-merge.yml carries no workflows_ref: — noted inline.
  • PR chore(deps): bump the ci-dependencies group across 1 directory with 6 updates #871 / chore(deps): bump the ci-dependencies group across 1 directory with 7 updates #832 — read via gh pr view / gh pr diff / gh pr checks (read-only;
    neither PR was modified). Findings quoted above.
  • The reference config — Comfy-Org/cloud/.github/dependabot.yml read directly;
    the two entries here are byte-identical to the two there.
  • Repo gate — ruff check . → All checks passed. ruff format --check . → 453
    files already formatted. pytest → 7590 passed, 4 failed, 38 skipped. The 4
    failures are pre-existing and unrelated: they reproduce identically on an
    unmodified origin/main worktree at the same commit (f35e41c), and this diff
    contains no Python. They are
    test_logs_pretty_warns_when_explicit_port_falls_back_to_unsuffixed,
    test_non_pep440_installed_version_is_unknown_not_a_crash, and the two
    test_atomic_write_*_new_file_uses_umask_default cases (the latter two look
    umask/environment-sensitive on this host).

Residual

Not fixed by this PR, actionable on its own:

  1. PR chore(deps): bump the ci-dependencies group across 1 directory with 6 updates #871 is already closed unmerged (2026-09-19). Nothing to do for it after this
    lands. Without the ignore, though, the next monthly Dependabot run can open a fresh
    split-pin PR, so this change is still needed.

  2. Four other org repos are still exposed, and one of them is new. I pointed the
    same measurement at the repos this fix does not cover — repos that both enable the
    github-actions Dependabot ecosystem and contain files calling
    Comfy-Org/github-workflows, but carry zero Comfy-Org/github-workflows ignore
    entries (gh api …/contents/.github/dependabot.yml + gh api search/code, measured
    2026-09-18):

    repo github-actions ecosystem ignore entries files calling github-workflows
    comfy-mcp yes 0 4
    comfy-python-sdk yes 0 2
    comfy-typescript-sdk yes 0 2
    ComfyUI_frontend yes 0 7
    cloud yes 2 18
    comfy-cloud-mcp-server yes 1 19
    github-workflows yes 1 72
    platform no 0 8
    comfy-infra no 0 13

    The first three are exactly the repos whose drift motivated this work.
    ComfyUI_frontend (7 caller files, no ignore) was not named anywhere in the
    motivating investigation
    and looks like the same exposure — worth a look before the
    equality guard is rolled out everywhere, since that rollout is what converts this
    from a silent split into a red check. platform and comfy-infra call these
    reusables but do not enable the ecosystem, so Dependabot cannot split their pins.

  3. github-workflows' and comfy-cloud-mcp-server's ignores use a looser form.
    github-workflows' own self-reference ignore is the single
    - dependency-name: "Comfy-Org/github-workflows*" — the unanchored trailing star
    this PR deliberately avoids. It is harmless today and starts to matter the day the
    org gains a repo whose name begins with github-workflows. I did not inspect which
    form comfy-cloud-mcp-server's single entry uses.

  4. Suppresses security updates too. With no versions: / update-types: qualifier,
    this also stops Dependabot security advisories for these reusables. Accepted, and
    the same trade-off cloud accepted: these are first-party org workflows pinned to
    reviewed SHAs, not registry packages, so an advisory-driven bump is not the update
    path here.

  5. I could not observe Dependabot actually honoring the ignore. That requires this
    to be on the default branch and the next monthly run to fire. The confidence rests on
    the semantics being identical to cloud's working config, not on an observed run here.

  6. Unexercised artifacts. The tracking issue that motivated this change, and its
    linked investigation, are in a tracker I have no access to from this environment —
    I worked from the change description alone and could not read them. The four
    cross-repo pull requests cited there as drift evidence
    (comfy-mcp Fixed: Pin version of click dependency. #265, comfy-python-sdk comfy model download --filename ? #136/Machine-Friendly Option Option #146, comfy-typescript-sdk the documentation link does not load #135/Add a --fast-deps option to comfy install/reinstall that enables new faster/unified/uv-based dependency install #141)
    were not individually opened; I corroborated the mechanism against this repo's own
    chore(deps): bump the ci-dependencies group across 1 directory with 6 updates #871 and chore(deps): bump the ci-dependencies group across 1 directory with 7 updates #832 instead, and sized the remainder with the sweep in item 2.

Correction, disclosed (review round): an earlier revision said
detect-unreviewed-merge.yml had no upstream bumper and would be bumped by hand. That
was wrong. bump-detect-unreviewed-merge-callers.yml exists upstream and has already
opened #978 here. The inline comment and the caller header now say so.

Method correction, disclosed: my first pass at the item-2 sweep matched only
double-quoted package-ecosystem: "github-actions" and so scored comfy-mcp as having
no ecosystem — it uses single quotes. The table above is the corrected, quote-agnostic
re-run. Noting it because the wrong version of that number would have argued the
motivating investigation had misattributed one of its four cases.

Provenance

  • Authored by: agent-work loop
  • Verified:
    • The branch is rebased onto current main (545d576). The diff is still 2 files: the ignore block in .github/dependabot.yml and the header comment in detect-unreviewed-merge.yml. It contains no Python.
    • Both edited YAML files parse with yaml.safe_load. ignore has exactly two dependency-name entries.
    • The five Comfy-Org/github-workflows callers are still the five listed above. ruff check . passes at this head.
    • The upstream bumper and its open bump PR here (ci: bump detect-unreviewed-merge to github-workflows@6af4cb8 #978) were read directly. ci: bump detect-unreviewed-merge to github-workflows@6af4cb8 #978 touches only the uses: line, so it does not conflict with the header edit.
    • pytest was run on the first revision only (7590 passed / 4 failed / 38 skipped; the same 4 fail on unmodified main). At this head it is left to CI.
  • Deviations:
    • No one has yet seen Dependabot honor the ignore (Residual item 5).

@mattmillerai mattmillerai added cursor-review Request Cursor bot review agent-coded PR authored by the agent-work loop labels Sep 18, 2026
@coderabbitai

coderabbitai Bot commented Sep 18, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

No actionable comments were generated in the recent review.

Walkthrough

Dependabot ignores Comfy-Org/github-workflows and its per-file paths. The workflow pinning guidance directs SHA updates to the upstream fleet and links to the Dependabot configuration.

Changes: Dependabot pin management

Layer / File(s) Summary
Ignore reusable workflow pins
.github/dependabot.yml, .github/workflows/detect-unreviewed-merge.yml
Dependabot ignores the reusable workflow dependency and its per-file paths. The workflow comment identifies the upstream fleet that updates the SHA and links to the Dependabot configuration.
Merge Risk: Low · up to 7bc3d

Dependabot will no longer issue ordinary or security-update PRs for these workflow pins. Upstream automation can update paired pins, but its private caller-roster coverage is unverified; confirm coverage to avoid pins becoming stale.

Pre-merge checks: Passed 5

Check name Status Explanation
Linked Issues check Passed Issue #871 is closed and completed. It supplies historical context only. No active directly linked issue supplies coding requirements for this pull request.
Out of Scope Changes check Passed The whole-PR diff adds the two intended Comfy-Org/github-workflows ignore entries and documents the coordinated pin update. The comment change in .github/workflows/detect-unreviewed-merge.yml expl…
Description Check Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check Passed The title names the main change: Dependabot now ignores Comfy-Org/github-workflows so it cannot update a reusable workflow's uses: SHA separately from its workflows_ref: pin. The raw summary and objec…
Architecture Decision Compliance Passed The check passes because the diff does not contradict any Accepted ADR and does not create a durable architectural decision that needs an ADR. Changed files (from refs/coderabbit/pre-merge-check/base …
Full details: Out of Scope Changes check

Explanation

The whole-PR diff adds the two intended Comfy-Org/github-workflows ignore entries and documents the coordinated pin update. The comment change in .github/workflows/detect-unreviewed-merge.yml explains the related upstream bumper and the new Dependabot behavior. No unrelated change appears.

Full details: Title check

Explanation

The title names the main change: Dependabot now ignores Comfy-Org/github-workflows so it cannot update a reusable workflow's uses: SHA separately from its workflows_ref: pin. The raw summary and objectives confirm the dependabot.yml ignore entries and the matching workflow comment update. The title is specific and accurate. Its length (92 characters) is somewhat long but within reason, and the ci(dependabot) prefix is a clear scope.

Full details: Architecture Decision Compliance

Explanation

The check passes because the diff does not contradict any Accepted ADR and does not create a durable architectural decision that needs an ADR. Changed files (from refs/coderabbit/pre-merge-check/base to head): - .github/dependabot.yml: adds an ignore: block with two dependency-name entries, Comfy-Org/github-workflows and Comfy-Org/github-workflows/*, plus rationale comments. - .github/workflows/detect-unreviewed-merge.yml: header comment only. The SHA bump is now attributed to the upstream bump-detect-unreviewed-merge-callers fleet. ADR review: - docs/adr/ holds 15 records, excluding TEMPLATE.md. Accepted records are AUTOMATION-0003, CONVERSION-0004, DEPENDENCIES-0001, KNOWLEDGE-0005, OPERATIONS-0002, SIDEBAR-0009, SIDEBAR-0013. The rest are Proposed. - I searched all ADRs and AGENTS.md for Dependabot, Renovate, reusable workflows, workflow pinning, and GitHub Actions. None of them governs CI dependency-update policy. The matches were unrelated uses of "SHA", "shared", or "pins" in product contexts. - DEPENDENCIES-0001 (Accepted) covers comfy-cli delegating unified Python dependency resolution to ComfyUI-Manager. This diff does not touch that boundary. - No Accepted ADR is contradicted. No Proposed ADR is relevant. Durable-decision test: - The change is a Dependabot ignore rule and a comment. It is local CI configuration. It is reversible by removing the ignore block. It does not change a product architecture boundary, invariant, data-ownership rule, or compatibility contract. - The rationale is recorded in the YAML comments and PR description. The check excludes routine and reversible implementation details, so no ADR is required. - No new or amended ADR is in the diff, so the authoring-guidance review does not apply. Limitations: I reviewed only the changed files, the ADR statuses and titles, and the searched ADR text. I did not read every ADR end to end. The conclusion rests on no ADR covering this area, not on a full read of each record.

Finishing Touches

🧪 Generate unit tests (beta)

  • Commit to this branch
  • Create a new PR
✨ Simplify code

  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
ℹ️ Recent review info

⚙️ Run configuration

  • Configuration used: Organization UI
  • Review profile: ASSERTIVE
  • Plan: Team
  • Run ID: 1ddfb2a2-e279-41d0-b45e-620d6b8e6a42
📥 Commits

Reviewing files that changed from the base of the PR and between 05c4c2a and 7bc3da3.

📒 Files selected for processing (2)

  • .github/dependabot.yml
  • .github/workflows/detect-unreviewed-merge.yml

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 3 remain after this review. Your free on-demand review promotion remains active until October 9, 2026 at 6:00 PM UTC.

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔍 Cursor Review — Consolidated panel

Triggered by @mattmillerai.

Found 4 finding(s).

Severity Count
🟡 Medium 1
🟢 Low 2
⚪ Nit 1

Panel: 6/6 reviewers contributed findings.

Comment thread .github/dependabot.yml Resolved
Comment thread .github/dependabot.yml Resolved
Comment thread .github/dependabot.yml Resolved
Comment thread .github/dependabot.yml Resolved
mattmillerai and others added 2 commits November 16, 2026 15:26
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.
…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 <noreply@anthropic.com>
@mattmillerai
mattmillerai force-pushed the matt/be-15272-dependabot-ignore-github-workflows branch from 7bc3da3 to 986f18d Compare November 16, 2026 23:26
@mattmillerai
mattmillerai requested a review from huntcsg November 16, 2026 23:26
@comfy-greenlight-bot

comfy-greenlight-bot commented Nov 16, 2026 •

Copy link
Copy Markdown

Swarmhost agentic review

The detailed evaluation is available to employees in the internal Slack review thread.

Evaluation budget remaining for this pull request: 14 automatic and 15 manual.

Updated by Swarmhost's agentic review process.

@comfy-greenlight-bot comfy-greenlight-bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pull request at head commit 986f18d has been reviewed and approved by Swarmhost's agentic review process.

The detailed evaluation is available to employees in the internal Slack review thread.

@mattmillerai
mattmillerai merged commit a766134 into main Nov 17, 2026
14 checks passed
@mattmillerai
mattmillerai deleted the matt/be-15272-dependabot-ignore-github-workflows branch November 17, 2026 00:39
@github-actions github-actions Bot locked and limited conversation to collaborators Nov 17, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

agent-coded PR authored by the agent-work loop cursor-review Request Cursor bot review greenlight

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants