Skip to content

Commit a901b89

Browse files
authored
Merge branch 'main' into dependabot/go_modules/k8s.io/client-go-0.31.3
2 parents 814958e + c6041cb commit a901b89

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

.github/mergify.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
queue_rules:
22
- name: default
3-
conditions:
4-
# Conditions to get out of the queue (= merged)
5-
- check-success=DCO
6-
- check-success=build
7-
8-
pull_request_rules:
9-
- name: Automatic merge on approval
10-
conditions:
3+
queue_conditions:
114
- base=main
125
- "#approved-reviews-by>=1"
136
- "#changes-requested-reviews-by=0"
@@ -18,10 +11,16 @@ pull_request_rules:
1811
- check-success=build
1912
- label!=do-not-merge
2013
- label=ready-to-merge
14+
merge_conditions:
15+
# Conditions to get out of the queue (= merged)
16+
- check-success=DCO
17+
- check-success=build
18+
merge_method: merge
19+
commit_message_template: |
20+
{{ title }} (#{{ number }})
21+
22+
pull_request_rules:
23+
- name: refactored queue action rule
24+
conditions: []
2125
actions:
2226
queue:
23-
method: merge
24-
name: default
25-
commit_message_template: |
26-
{{ title }} (#{{ number }})
27-

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
run: make test
4545

4646
- name: Upload codecov
47-
uses: codecov/codecov-action@v4
47+
uses: codecov/codecov-action@v5
4848
env:
4949
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
5050

0 commit comments

Comments
 (0)