-
-
Notifications
You must be signed in to change notification settings - Fork 2
ci: Mergify merge queue, dependabot integration, and CI simplification #79
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
28a37cf
57da090
3056c96
a4d65ca
d2dc863
e1f2aab
0afa92f
35b44eb
de6f600
a8f11b9
5a71447
e329054
3a1f21c
f2e62c1
7aa194e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| allowRemediationCommits: | ||
| individual: true | ||
| thirdParty: true | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,19 @@ | ||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: "cargo" # See documentation for possible values | ||
| directory: "/" # Location of package manifests | ||
| - package-ecosystem: "cargo" | ||
| directory: "/" | ||
| schedule: | ||
| interval: "weekly" | ||
| rebase-strategy: "disabled" | ||
|
|
||
| - package-ecosystem: "github-actions" | ||
| directory: "/" | ||
| schedule: | ||
| interval: weekly | ||
| interval: "weekly" | ||
| rebase-strategy: "disabled" | ||
|
|
||
| - package-ecosystem: "devcontainers" | ||
| directory: "/" | ||
| schedule: | ||
| interval: weekly | ||
| interval: "weekly" | ||
| rebase-strategy: "disabled" | ||
|
unclesp1d3r marked this conversation as resolved.
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,31 +11,63 @@ queue_rules: | |
| - check-success = coverage | ||
|
|
||
| pull_request_rules: | ||
| - name: Queue PRs when approved | ||
| # Tier 1: Maintainer PRs -- queue when maintainer adds 'lgtm' label | ||
| - name: Queue maintainer PRs with lgtm label | ||
| conditions: | ||
| - base = main | ||
| - "#approved-reviews-by >= 1" | ||
| - "author=@maintainers" | ||
| - label = lgtm | ||
| - label != do-not-merge | ||
| actions: | ||
| queue: | ||
| name: default | ||
|
|
||
| # Tier 2: Trusted bot PRs -- auto-queue when checks pass | ||
| - name: Auto-queue release-plz PRs | ||
| conditions: | ||
| - base = main | ||
| - "head ~= ^release-plz-" | ||
| - label != do-not-merge | ||
| actions: | ||
| queue: | ||
| name: default | ||
|
|
||
| - name: Auto-queue dependabot PRs | ||
| - name: Auto-approve and queue dependabot PRs | ||
| conditions: | ||
| - base = main | ||
| - author = dependabot[bot] | ||
| - label != do-not-merge | ||
| - -files~=\.github/workflows/release\.yml | ||
| actions: | ||
| review: | ||
| type: APPROVE | ||
| message: Automatically approved by Mergify | ||
|
unclesp1d3r marked this conversation as resolved.
|
||
| queue: | ||
| name: default | ||
|
|
||
| # Tier 3: All other PRs (external contributors, copilot) -- require maintainer approval | ||
| - name: Queue external PRs when approved by maintainer | ||
| conditions: | ||
| - base = main | ||
| - "-author=@maintainers" | ||
| - author != dependabot[bot] | ||
| - "-head ~= ^release-plz-" | ||
| - "approved-reviews-by=@maintainers" | ||
| - label != do-not-merge | ||
|
Comment on lines
+35
to
+56
|
||
| actions: | ||
| queue: | ||
| name: default | ||
|
|
||
| - name: Keep PRs up to date with main | ||
| conditions: | ||
| - base = main | ||
| - -conflict | ||
| - -draft | ||
| - -author = dependabot[bot] | ||
|
unclesp1d3r marked this conversation as resolved.
|
||
| - label != do-not-merge | ||
|
unclesp1d3r marked this conversation as resolved.
|
||
| actions: | ||
| update: {} | ||
|
|
||
| merge_protections: | ||
| - name: CI must pass | ||
| description: >- | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.