Skip to content

Commit f64d9d4

Browse files
Update dependabot and mergify
1 parent 6d847ca commit f64d9d4

2 files changed

Lines changed: 48 additions & 0 deletions

File tree

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,10 @@ updates:
1111
directory: "/"
1212
schedule:
1313
interval: "weekly"
14+
- package-ecosystem: "github-actions"
15+
# Workflow files stored in the
16+
# default location of `.github/workflows`
17+
directory: "/"
18+
schedule:
19+
interval: "weekly"
20+
target-branch: "humble"

.github/mergify.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
pull_request_rules:
2+
- name: Backport to humble at reviewers discretion
3+
conditions:
4+
- base=master
5+
- "label=backport-humble"
6+
actions:
7+
backport:
8+
branches:
9+
- humble
10+
11+
- name: Ask to resolve conflict
12+
conditions:
13+
- conflict
14+
- author!=mergify[bot]
15+
- author!=dependabot[bot]
16+
actions:
17+
comment:
18+
message: This pull request is in conflict. Could you fix it @{{author}}?
19+
20+
- name: Ask to resolve conflict for backports
21+
conditions:
22+
- conflict
23+
- author=mergify[bot]
24+
actions:
25+
comment:
26+
message: This pull request is in conflict. Could you please fix it @christophfroehlich?
27+
28+
- name: development targets master branch
29+
conditions:
30+
- base!=master
31+
- author!=bmagyar
32+
- author!=christophfroehlich
33+
- author!=nbbrooks
34+
- author!=mergify[bot]
35+
- author!=dependabot[bot]
36+
actions:
37+
comment:
38+
message: |
39+
@{{author}}, all pull requests must be targeted towards the `master` development branch.
40+
Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
41+
to have these changes reflected into new distributions.

0 commit comments

Comments
 (0)