From 9fda209018e1eb254e862bb1f05753341698538d Mon Sep 17 00:00:00 2001 From: Kyle Sexton <153232337+kyle-sexton@users.noreply.github.com> Date: Sun, 15 Nov 2026 15:55:41 -0500 Subject: [PATCH] ci(dependabot): correct the auto-merge lane comments for first-party actions The auto-merge caller also arms melodic-software/* bumps when the base holds the synced Dependabot policy copy, and a first-party major stays in the first-party-actions group, where the lane does not arm it. Co-Authored-By: Claude Fable 5.2 --- .github/dependabot.yml | 6 ++++-- .github/workflows/pr-automerge-dependabot.yml | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2355997..59403bc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,8 +7,10 @@ # `first-party-actions` group (the melodic-software/ci-workflows composite # action pins) and the `vendor-actions` group (non-major only) are the # auto-merge lanes armed by pr-automerge-dependabot.yml; every other PR is -# reviewed by hand. A dependency joins the first group that matches it, so -# majors fall through to the reviewed `github-actions` group. +# in the review tier. A dependency joins the first group that matches it: a +# vendor major falls through to the reviewed `github-actions` group, and a +# first-party major stays in `first-party-actions`, where the lane does not arm +# a pull request that holds a major bump, so it takes the review tier. version: 2 updates: - package-ecosystem: github-actions diff --git a/.github/workflows/pr-automerge-dependabot.yml b/.github/workflows/pr-automerge-dependabot.yml index 6e7d055..4cc625a 100644 --- a/.github/workflows/pr-automerge-dependabot.yml +++ b/.github/workflows/pr-automerge-dependabot.yml @@ -2,7 +2,8 @@ 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 +# (`actions/*`, `github/*`, `anthropics/*` and, through the synced Dependabot +# policy copy, `melodic-software/*`) by a patch or minor version. 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