Skip to content

Commit 95414a4

Browse files
JohnMcLearclaude
andcommitted
ci: auto-merge Dependabot PRs after CI passes
Mirrors the etherpad-org house rule: trust CI for major bumps, don't semver-filter. The workflow waits for the lint-typecheck-test and e2e jobs to succeed, then enables auto-merge with squash. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent ed470b2 commit 95414a4

2 files changed

Lines changed: 31 additions & 0 deletions

File tree

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Dependabot auto-merge
2+
on: pull_request_target
3+
4+
permissions:
5+
contents: write
6+
pull-requests: write
7+
8+
jobs:
9+
auto-merge:
10+
runs-on: ubuntu-latest
11+
if: github.actor == 'dependabot[bot]'
12+
steps:
13+
- name: Wait for CI to succeed
14+
uses: lewagon/wait-on-check-action@v1.4.0
15+
with:
16+
ref: ${{ github.event.pull_request.head.sha }}
17+
repo-token: ${{ secrets.GITHUB_TOKEN }}
18+
wait-interval: 30
19+
allowed-conclusions: success,skipped
20+
check-regexp: '^(lint-typecheck-test|e2e)$'
21+
- name: Enable auto-merge
22+
run: gh pr merge --auto --squash "$PR_URL"
23+
env:
24+
PR_URL: ${{ github.event.pull_request.html_url }}
25+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

AGENTS.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ After main-process source changes, **restart `pnpm dev`** — Vite HMR only cove
4949
- Commits: conventional style (`feat(scope): …`, `fix(scope): …`, `test(e2e): …`, `docs(scope): …`).
5050
- Push to `origin/feat/linux-mvp` after every fix or feature commit. Don't batch.
5151

52+
## CI / Dependabot
53+
54+
- Dependabot is configured for npm and GitHub Actions deps (`.github/dependabot.yml`).
55+
- Dependabot PRs auto-merge once CI passes (`.github/workflows/dependabot-auto-merge.yml`). No semver filter — trust CI for major bumps too; CI gates breakage.
56+
- The auto-merge workflow waits for `lint-typecheck-test` and `e2e` jobs using `lewagon/wait-on-check-action`, then enables squash auto-merge via `gh pr merge --auto --squash`.
57+
5258
## House rules
5359

5460
- Match the spec at `docs/superpowers/specs/2026-05-03-etherpad-desktop-linux-mvp-design.md` and the plan at `docs/superpowers/plans/2026-05-03-etherpad-desktop-linux-mvp.md`.

0 commit comments

Comments
 (0)