Merge pull request #248 from nix-community/mergify

switch from bors to mergify
This commit is contained in:
Jörg Thalheim 2023-06-16 15:11:50 +01:00 committed by GitHub
commit 9fcfbef1ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 11 deletions

View File

@ -2,6 +2,8 @@ name: "Test"
on:
pull_request:
push:
branches:
- master
jobs:
build:
strategy:

View File

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

17
.mergify.yml Normal file
View File

@ -0,0 +1,17 @@
queue_rules:
- name: default
merge_conditions:
- check-success=build (macos-latest)
- check-success=build (ubuntu-latest)
defaults:
actions:
queue:
allow_merging_configuration_change: true
method: rebase
pull_request_rules:
- name: merge using the merge queue
conditions:
- base=master
- label~=merge-queue|dependencies
actions:
queue: {}

View File

@ -1,5 +0,0 @@
cut_body_after = "" # don't include text from the PR body in the merge commit message
status = [
"build (macos-latest)",
"build (ubuntu-latest)"
]