Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/k8s.io/client-go-0.31.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Nov 23, 2024
2 parents 814958e + c6041cb commit a901b89
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
25 changes: 12 additions & 13 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
queue_rules:
- name: default
conditions:
# Conditions to get out of the queue (= merged)
- check-success=DCO
- check-success=build

pull_request_rules:
- name: Automatic merge on approval
conditions:
queue_conditions:
- base=main
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
Expand All @@ -18,10 +11,16 @@ pull_request_rules:
- check-success=build
- label!=do-not-merge
- label=ready-to-merge
merge_conditions:
# Conditions to get out of the queue (= merged)
- check-success=DCO
- check-success=build
merge_method: merge
commit_message_template: |
{{ title }} (#{{ number }})
pull_request_rules:
- name: refactored queue action rule
conditions: []
actions:
queue:
method: merge
name: default
commit_message_template: |
{{ title }} (#{{ number }})
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
run: make test

- name: Upload codecov
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Expand Down

0 comments on commit a901b89

Please sign in to comment.