Skip to content

Commit ff43570

Browse files
chore: update mergify config
1 parent bba69df commit ff43570

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'CI'
1+
name: "CI"
22

33
on:
44
push:
@@ -7,7 +7,6 @@ on:
77
pull_request:
88

99
jobs:
10-
1110
ci:
1211
needs: [test]
1312
runs-on: ubuntu-latest
@@ -19,12 +18,11 @@ jobs:
1918
runs-on: ubuntu-latest
2019
strategy:
2120
matrix:
22-
yarncmd: ['test']
21+
yarncmd: ["test"]
2322
steps:
2423
- uses: actions/checkout@v2
2524
- name: Configure
2625
run: |
27-
npm config set scripts-prepend-node-path auto
2826
git config --global user.email [email protected]
2927
git config --global user.name uirouter_github_actions
3028
- name: Install Dependencies

.mergify.yml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
1+
queue_rules:
2+
- name: default
3+
merge_method: squash
4+
5+
- name: rebase
6+
merge_method: rebase
7+
18
pull_request_rules:
29
- name: Auto Squash and Merge
310
conditions:
411
- base=master
5-
- status-success=ci
6-
- 'label=ready to squash and merge'
12+
- check-success=ci
13+
- label=ready to squash and merge
714
actions:
8-
delete_head_branch: {}
9-
merge:
10-
method: squash
11-
strict: smart
15+
queue:
16+
name: default
17+
delete_head_branch:
18+
1219
- name: Auto Rebase and Merge
1320
conditions:
1421
- base=master
15-
- status-success=ci
16-
- 'label=ready to rebase and merge'
22+
- check-success=ci
23+
- label=ready to rebase and merge
1724
actions:
18-
delete_head_branch: {}
19-
merge:
20-
method: rebase
21-
strict: smart
25+
queue:
26+
name: rebase
27+
delete_head_branch:

0 commit comments

Comments
 (0)