Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 17 additions & 36 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ version: 2

# This repository carries no build and no package manager, so the only
# ecosystem with a manifest here is `github-actions`: the SHA-pinned `uses:`
# refs in `.github/workflows/**`. Keeping them under Dependabot is what makes
# the next melodic-software/ci-workflows tag arrive as one reviewable pull
# request instead of a hand sweep (ci-perf Phase 6b-i).
# refs in `.github/workflows/**`.
#
# `directory: /` scans `.github/workflows`. There is no `.github/actions/`
# here, so no glob target is needed; add one if composite actions land.
#
# Review every pull request before merge and never auto-merge: an action SHA
# bump is executable CI logic.
# 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. A dependency
# joins the first group that matches it, so majors fall through to the
# reviewed `github-actions` group.
updates:
- package-ecosystem: github-actions
directory: /
Expand All @@ -23,41 +24,21 @@ updates:
commit-message:
prefix: build
# Delay version bumps so a compromised or yanked release is caught before
# this repository adopts it; security updates bypass the cooldown. Same
# posture and same window as melodic-software/ci-workflows.
# this repository adopts it; security updates bypass the cooldown.
cooldown:
default-days: 7
# One pull request for every action bump, so a ci-workflows tag lands as a
# single review rather than one pull request per pinned reference.
default-days: 3
groups:
vendor-actions:
patterns:
- actions/*
- github/*
- anthropics/*
update-types: [minor, patch]
github-actions:
patterns:
- '*'
# `.github/workflows/managed-files-guard.yml` is a sync-managed destination
# (source of truth: melodic-software/standards,
# components/managed-files-guard). Its ci-workflows pin moves upstream
# through the claude-lanes-repin cascade and a downstream edit is both
# caught by the guard itself and overwritten by the next sync pull request,
# so Dependabot must not touch it. This is the only composite-action ci-workflows reference
# that lives solely in that file; `pr-contract` and `ci-status` are
# locally owned in `ci.yml` and stay Dependabot-managed, which is the point
# of this configuration.
#
# `.github/workflows/claude-review-hosted.yml` and
# `.github/workflows/claude-security-review-hosted.yml` are sync-managed
# destinations too (source of truth: melodic-software/standards,
# components/claude-lanes-hosted). Each pins one ci-workflows reusable
# workflow that moves upstream through the same repin cascade, so both are
# ignored for the same reason.
#
# `actions/checkout` is pinned in both `ci.yml` and the managed guard at the
# same SHA, and Dependabot's ignore list cannot be scoped to a file, so a
# checkout bump still edits the managed copy. That overlap is fleet-wide and
# pre-existing (no sibling repository ignores `actions/checkout` either);
# the guard is advisory here and the standards sync reconciles it.
# Every melodic-software/ci-workflows ref (reusable workflows AND composite
# actions) moves only through deliberate reviewed PRs per the standards
# runner-policy selector-revision lockstep, so all of them are ignored here.
ignore:
- dependency-name: "melodic-software/ci-workflows/.github/actions/managed-files-guard"
- dependency-name: "melodic-software/ci-workflows/.github/workflows/claude-review.yml"
- dependency-name: "melodic-software/ci-workflows/.github/workflows/claude-security-review.yml"
# The GitHub Actions conventions rename migrates this repo's ci-workflows pins deliberately; remove this ignore at that migration.
- dependency-name: "melodic-software/ci-workflows/*"
28 changes: 28 additions & 0 deletions .github/workflows/pr-automerge-dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
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,
# 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.

on:
pull_request:

permissions: {}

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:
pr-automerge-dependabot:
permissions:
contents: write # enablePullRequestAutoMerge requires it.
pull-requests: write # Arm or disarm auto-merge on the PR.
uses: melodic-software/ci-workflows/.github/workflows/pr-automerge-dependabot.yml@69e506b7c119517ef1dfc421479232b386b93a52 # v0.35.0
with:
runner: ubuntu-24.04
Comment thread
kyle-sexton marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ci
name: pr-require-checks

# Consumer-side gate for the org ci-gate ruleset: `ci-status` is one of the four
# required contexts, and it is only meaningful when it aggregates real lanes.
Expand Down Expand Up @@ -60,7 +60,7 @@ permissions:
#
# The cost of the branch: a contract-only run no longer queues behind the full
# run whose `ci-lanes` status it carries forward, so the two race. The
# `ci-status` composite closes that with a bounded wait on EARLIER incomplete
# `aggregate-results` composite closes that with a bounded wait on EARLIER incomplete
# runs on the same head SHA; see `carry-forward-wait-seconds` on the job below.
#
# One hazard the branch does not remove, because no concurrency setting both
Expand All @@ -79,7 +79,7 @@ concurrency:
cancel-in-progress: true

jobs:
scripts:
check-scripts-and-manifests:
name: Scripts and manifests
if: ${{ !(github.event.pull_request.head.repo.full_name == github.repository && (contains(fromJSON('["labeled","unlabeled"]'), github.event.action) || (github.event.action == 'edited' && !github.event.changes.base))) }}
runs-on: ubuntu-24.04
Expand All @@ -104,13 +104,13 @@ jobs:
jq empty .cursor/environment.json

ci-status:
needs: [scripts]
needs: [check-scripts-and-manifests]
if: ${{ !cancelled() }}
runs-on: ubuntu-24.04
timeout-minutes: 5
permissions:
contents: read
# pr-contract upserts the advisory linkage comment and moves the linkage
# check-contract upserts the advisory linkage comment and moves the linkage
# label; ci-status records the `ci-lanes` commit status the carry-forward
# branch reads back on the next contract-only event.
pull-requests: write
Expand All @@ -124,15 +124,15 @@ jobs:
- name: Check the pull-request contract
# A `push` or `merge_group` run carries no pull-request number, which
# makes this step a no-op reporting every output as `skipped`.
uses: melodic-software/ci-workflows/.github/actions/pr-contract@4610c31e92eb1c4b24981e2f200ac87bdb2a1753 # v0.27.1
uses: melodic-software/ci-workflows/.github/actions/pr-require-checks/check-contract@7446b5165511796b7b0d30b68d341689ebb8de61 # v0.34.0
with:
token: ${{ github.token }}
- name: Aggregate lane results
# `!cancelled()` so a failing pr-contract step does not skip the
# `!cancelled()` so a failing check-contract step does not skip the
# 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/ci-status@4610c31e92eb1c4b24981e2f200ac87bdb2a1753 # v0.27.1
uses: melodic-software/ci-workflows/.github/actions/pr-require-checks/aggregate-results@7446b5165511796b7b0d30b68d341689ebb8de61 # v0.34.0
with:
# At least 60 seconds below this job's `timeout-minutes: 5` (300s), so
# the fail-closed error is what a contract-only run reports at the
Expand Down