Skip to content

Commit 3c3946d

Browse files
committed
chore(mergify): clean up mergify rules
1 parent 15c5d8d commit 3c3946d

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

.github/workflows/semantic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
main:
12-
name: Validate
12+
name: lint_pull_request
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: amannn/action-semantic-pull-request@v4

.mergify.yml

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,40 @@
1+
pull_request_rules:
2+
- name: Automatic merge queue
3+
conditions:
4+
- -draft
5+
- base = master
6+
actions:
7+
queue:
8+
19
queue_rules:
210
- name: Automatic boxmoji merge
311
queue_conditions:
4-
- author=boxmoji
5-
- base=master
6-
- files~=^i18n/
7-
- status-success="Validate"
8-
- status-success=lint_test_build
9-
- title~=^(fix)\(i18n\)?:\supdate translations$
12+
- author = boxmoji
13+
- title ~= ^(fix)\(i18n\)?:\supdate translations$
14+
- files ~= ^i18n/
15+
- label != do-not-merge
16+
- status-success = license/cla
17+
- status-success = lint_pull_request
18+
- status-success = lint_test_build
1019
merge_conditions:
11-
- status-success="Validate"
12-
- status-success=lint_test_build
20+
- status-success = lint_pull_request
21+
- status-success = lint_test_build
1322
merge_method: squash
1423

1524
- name: Automatic strict merge
1625
queue_conditions:
17-
- base=master
18-
- "#approved-reviews-by>=2"
19-
- "#changes-requested-reviews-by=0"
20-
- "#review-requested=0"
21-
- "#review-threads-unresolved=0"
22-
- status-success="Validate"
23-
- status-success=license/cla
24-
- status-success=lint_test_build
25-
- label=ready-to-merge
26-
- label!=do-not-merge
27-
- title~=^(build|ci|chore|docs|feat|fix|perf|refactor|revert|style|test)(\([^)]+\))?:\s.+$
26+
- title ~= ^(build|ci|chore|docs|feat|fix|perf|refactor|revert|style|test)(\([^)]+\))?:\s.+$
27+
- label = ready-to-merge
28+
- label != do-not-merge
29+
- status-success = license/cla
30+
- status-success = lint_pull_request
31+
- status-success = lint_test_build
32+
- branch-protection-review-decision = APPROVED
33+
- "#approved-reviews-by >= 2"
34+
- "#changes-requested-reviews-by = 0"
35+
- "#review-threads-unresolved = 0"
2836
merge_conditions:
29-
- status-success="Validate"
30-
- status-success=license/cla
31-
- status-success=lint_test_build
37+
- status-success = license/cla
38+
- status-success = lint_pull_request
39+
- status-success = lint_test_build
3240
merge_method: squash
33-
34-
pull_request_rules:
35-
- name: Automatic merge queue
36-
conditions: []
37-
actions:
38-
queue:

0 commit comments

Comments
 (0)