mergify: replace bors's merge queue
This commit is contained in:
parent
0741e1f4ab
commit
239f8d26c9
2
.github/workflows/update-flake-lock.yml
vendored
2
.github/workflows/update-flake-lock.yml
vendored
|
@ -19,3 +19,5 @@ jobs:
|
||||||
uses: DeterminateSystems/update-flake-lock@v19
|
uses: DeterminateSystems/update-flake-lock@v19
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
|
token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
|
||||||
|
pr-labels: | # Labels to be set on the PR
|
||||||
|
merge-queue
|
||||||
|
|
26
.mergify.yml
26
.mergify.yml
|
@ -1,15 +1,21 @@
|
||||||
pull_request_rules:
|
queue_rules:
|
||||||
- name: automatic merge on CI success
|
- name: default
|
||||||
conditions:
|
merge_conditions:
|
||||||
- check-success=Evaluate flake.nix
|
- check-success=Evaluate flake.nix
|
||||||
- check-success=package nix-eval-jobs [x86_64-linux]
|
|
||||||
- check-success=devShell default [x86_64-linux]
|
|
||||||
- check-success=check treefmt [x86_64-linux]
|
- check-success=check treefmt [x86_64-linux]
|
||||||
|
- check-success=devShell default [x86_64-linux]
|
||||||
- check-success=package default [x86_64-linux]
|
- check-success=package default [x86_64-linux]
|
||||||
- check-success=tests (ubuntu-latest)
|
- check-success=package nix-eval-jobs [x86_64-linux]
|
||||||
- check-success=tests (macos-latest)
|
- check-success=tests (macos-latest)
|
||||||
- author=nix-eval-jobs-bot
|
- check-success=tests (ubuntu-latest)
|
||||||
|
defaults:
|
||||||
actions:
|
actions:
|
||||||
merge:
|
queue:
|
||||||
method: merge
|
allow_merging_configuration_change: true
|
||||||
delete_head_branch: {}
|
pull_request_rules:
|
||||||
|
- name: merge using the merge queue
|
||||||
|
conditions:
|
||||||
|
- base=main
|
||||||
|
- label=merge-queue
|
||||||
|
actions:
|
||||||
|
queue: {}
|
||||||
|
|
12
bors.toml
12
bors.toml
|
@ -1,12 +0,0 @@
|
||||||
cut_body_after = "" # don't include text from the PR body in the merge commit message
|
|
||||||
status = [
|
|
||||||
# garnix
|
|
||||||
"Evaluate flake.nix",
|
|
||||||
"package nix-eval-jobs [x86_64-linux]",
|
|
||||||
"devShell default [x86_64-linux]",
|
|
||||||
"check treefmt [x86_64-linux]",
|
|
||||||
"package default [x86_64-linux]",
|
|
||||||
# github actions
|
|
||||||
"tests (ubuntu-latest)",
|
|
||||||
"tests (macos-latest)"
|
|
||||||
]
|
|
Loading…
Reference in a new issue