Skip to content

Commit 9fcfbef

Browse files
authored
Merge pull request #248 from nix-community/mergify
switch from bors to mergify
2 parents f17fb67 + 1a2e8fc commit 9fcfbef

File tree

4 files changed

+21
-11
lines changed

4 files changed

+21
-11
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: "Test"
22
on:
33
pull_request:
44
push:
5+
branches:
6+
- master
57
jobs:
68
build:
79
strategy:

.github/workflows/update-flake-lock.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,5 @@ jobs:
1717
- name: Update flake.lock
1818
uses: DeterminateSystems/update-flake-lock@v19
1919
with:
20-
pr-body: |
21-
Automated changes by the update-flake-lock
22-
```
23-
{{ env.GIT_COMMIT_MESSAGE }}
24-
```
25-
bors merge
20+
pr-labels: |
21+
merge-queue

.mergify.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
queue_rules:
2+
- name: default
3+
merge_conditions:
4+
- check-success=build (macos-latest)
5+
- check-success=build (ubuntu-latest)
6+
defaults:
7+
actions:
8+
queue:
9+
allow_merging_configuration_change: true
10+
method: rebase
11+
pull_request_rules:
12+
- name: merge using the merge queue
13+
conditions:
14+
- base=master
15+
- label~=merge-queue|dependencies
16+
actions:
17+
queue: {}

bors.toml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)