Skip to content

Commit 74e8173

Browse files
committed
testing mergify
1 parent 673682a commit 74e8173

File tree

5 files changed

+95
-1
lines changed

5 files changed

+95
-1
lines changed

.github/mergify.yml

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
queue_rules:
2+
- name: default
3+
checks_timeout: 8 h
4+
merge_method: squash
5+
queue_conditions:
6+
- check-success=Summary
7+
- check-success=hello-world-pr
8+
priority_rules:
9+
- name: default
10+
conditions:
11+
- -label=flag:urgent
12+
priority: medium
13+
- name: urgent
14+
conditions:
15+
- label=flag:urgent
16+
priority: high
17+
branch_protection_injection_mode: merge
18+
merge_conditions:
19+
- "#commits-behind==0"
20+
- "label=flag:merge"
21+
- check-success=hello-world-pr
22+
- check-failure=hello-world
23+
24+
pull_request_rules:
25+
- name: add-to-merge-queue
26+
conditions:
27+
- -draft
28+
- -closed
29+
- -merged
30+
- -conflict
31+
- base=main
32+
- label=flag:merge
33+
actions:
34+
queue:
35+
- name: remove-merge-on-failure
36+
conditions:
37+
- -closed
38+
- -merged
39+
- -conflict
40+
- base=main
41+
- check-failure=hello-world-pr
42+
- check-success!=hello-world-pr
43+
- -label=flag:urgent
44+
- label=flag:merge
45+
- "#commits-behind=0"
46+
- queue-position=0
47+
actions:
48+
label:
49+
remove:
50+
- flag:merge
51+
- name: remove-merge-label-conflict
52+
conditions:
53+
- -closed
54+
- -merged
55+
- base=main
56+
- -label=flag:urgent
57+
- label=flag:merge
58+
- conflict
59+
actions:
60+
comment:
61+
message: The PR has a conflict, removing flag merge.
62+
label:
63+
remove:
64+
- flag:merge
65+
66+

.github/workflows/main.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: main
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
hello-world:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: say-hello-world
13+
run: exit 1
14+

.github/workflows/pr.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: pr
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
8+
jobs:
9+
hello-world-pr:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: say-hello-world
13+
run: echo "Hello World!"

.gitignore_global

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,4 @@ Brewfile.lock.json
198198
*.zip
199199
*.~*
200200
*~
201-
201+
# test

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,4 @@ stow .
5858
- [kickstart.nvim](https://github.com/nvim-lua/kickstart.nvim)
5959
- [brew-bundle-brewfile-tips.md](https://gist.github.com/ChristopherA/a579274536aab36ea9966f301ff14f3f#)
6060

61+
bump 1

0 commit comments

Comments
 (0)