Skip to content

Commit f6397f7

Browse files
Added mergify and publishing support for supported branches.
Signed-off-by: Leander Stephen D'Souza <[email protected]>
1 parent 9edd92d commit f6397f7

File tree

2 files changed

+58
-1
lines changed

2 files changed

+58
-1
lines changed

.circleci/config.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,8 @@ workflows:
9696
- docs_build
9797
filters:
9898
branches:
99-
only: master
99+
only:
100+
- master
101+
- kilted
102+
- jazzy
103+
- humble

.github/mergify.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
pull_request_rules:
2+
3+
- name: backport at reviewers discretion
4+
conditions:
5+
- base=master
6+
- "label=backport-all"
7+
actions:
8+
backport:
9+
branches:
10+
- kilted
11+
- jazzy
12+
- humble
13+
14+
- name: backport to kilted at reviewers discretion
15+
conditions:
16+
- base=master
17+
- "label=backport-kilted"
18+
actions:
19+
backport:
20+
branches:
21+
- kilted
22+
23+
- name: backport to jazzy at reviewers discretion
24+
conditions:
25+
- base=master
26+
- "label=backport-jazzy"
27+
actions:
28+
backport:
29+
branches:
30+
- jazzy
31+
32+
- name: backport to humble at reviewers discretion
33+
conditions:
34+
- base=master
35+
- "label=backport-humble"
36+
actions:
37+
backport:
38+
branches:
39+
- humble
40+
41+
- name: delete head branch after merge
42+
conditions:
43+
- merged
44+
actions:
45+
delete_head_branch:
46+
47+
- name: ask to resolve conflict
48+
conditions:
49+
- conflict
50+
- author!=mergify
51+
actions:
52+
comment:
53+
message: This pull request is in conflict. Could you fix it @{{author}}?

0 commit comments

Comments
 (0)