replace bors with mergify

This commit is contained in:
Jörg Thalheim 2023-06-12 06:46:18 +02:00
parent 5d9f362aec
commit 160bd22789
3 changed files with 44 additions and 37 deletions

View File

@ -16,9 +16,5 @@ jobs:
uses: DeterminateSystems/update-flake-lock@v19
with:
token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
pr-body: |
Automated changes by the update-flake-lock
```
{{ env.GIT_COMMIT_MESSAGE }}
```
bors merge
pr-labels: |
merge-queue

42
.mergify.yml Normal file
View File

@ -0,0 +1,42 @@
queue_rules:
- name: default
merge_conditions:
- check-success=Evaluate flake.nix
- check-success=check bcachefs [x86_64-linux]
- check-success=check boot-raid1 [x86_64-linux]
- check-success=check btrfs-subvolumes [x86_64-linux]
- check-success=check cli [x86_64-linux]
- check-success=check complex [x86_64-linux]
- check-success=check gpt-bios-compat [x86_64-linux]
- check-success=check hybrid [x86_64-linux]
- check-success=check hybrid-tmpfs-on-root [x86_64-linux]
- check-success=check luks-lvm [x86_64-linux]
- check-success=check lvm-raid [x86_64-linux]
- check-success=check lvm-sizes-sort [x86_64-linux]
- check-success=check mdadm [x86_64-linux]
- check-success=check module [x86_64-linux]
- check-success=check multi-device-no-deps [x86_64-linux]
- check-success=check negative-size [x86_64-linux]
- check-success=check shellcheck [x86_64-linux]
- check-success=check simple-efi [x86_64-linux]
- check-success=check standalone [x86_64-linux]
- check-success=check swap [x86_64-linux]
- check-success=check tmpfs [x86_64-linux]
- check-success=check with-lib [x86_64-linux]
- check-success=check zfs [x86_64-linux]
- check-success=check zfs-over-legacy [x86_64-linux]
- check-success=package default [x86_64-linux]
- check-success=package disko [x86_64-linux]
- check-success=package disko-doc [x86_64-linux]
- check-success=package linux-bcachefs [x86_64-linux]
defaults:
actions:
queue:
allow_merging_configuration_change: true
pull_request_rules:
- name: merge using the merge queue
conditions:
- base=master
- label=merge-queue
actions:
queue: {}

View File

@ -1,31 +0,0 @@
cut_body_after = "" # don't include text from the PR body in the merge commit message
status = [
"Evaluate flake.nix",
"check bcachefs [x86_64-linux]",
"check boot-raid1 [x86_64-linux]",
"check btrfs-subvolumes [x86_64-linux]",
"check cli [x86_64-linux]",
"check complex [x86_64-linux]",
"check gpt-bios-compat [x86_64-linux]",
"check hybrid [x86_64-linux]",
"check hybrid-tmpfs-on-root [x86_64-linux]",
"check luks-lvm [x86_64-linux]",
"check lvm-raid [x86_64-linux]",
"check lvm-sizes-sort [x86_64-linux]",
"check mdadm [x86_64-linux]",
"check module [x86_64-linux]",
"check multi-device-no-deps [x86_64-linux]",
"check negative-size [x86_64-linux]",
"check shellcheck [x86_64-linux]",
"check simple-efi [x86_64-linux]",
"check standalone [x86_64-linux]",
"check swap [x86_64-linux]",
"check tmpfs [x86_64-linux]",
"check with-lib [x86_64-linux]",
"check zfs [x86_64-linux]",
"check zfs-over-legacy [x86_64-linux]",
"package default [x86_64-linux]",
"package disko [x86_64-linux]",
"package disko-doc [x86_64-linux]",
"package linux-bcachefs [x86_64-linux]"
]