Merge branch 'main' into dependabot/go_modules/sigs.k8s.io/controller…

…-runtime-0.19.2
tinkerbell · Nov 23, 2024 · e287e9f · e287e9f
2 parents 96a4d04 + 98f5f75
commit e287e9f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -18,23 +18,21 @@ shared:
 
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
       - and: *compulsory
-
-pull_request_rules:
-  - name: Automatic merge
-    conditions:
-      - and: *compulsory
-
-      # Ensure the review is opted in using labels.
       - label!=do-not-merge
       - label=ready-to-merge
+    merge_conditions:
+      - and: *compulsory
 
+    merge_method: merge
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+
+pull_request_rules:
+  - name: refactored queue action rule
+    conditions: []
     actions:
       queue:
-        method: merge
-        name: default
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-
-          {{ body }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -42,7 +42,7 @@ jobs:
         run: go test -coverprofile=coverage.txt ./...
 
       - name: Upload codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
@@ -63,7 +63,7 @@ jobs:
         run: make test-integration
 
       - name: Upload codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
@@ -108,7 +108,7 @@ jobs:
         run: make test-e2e
 
       - name: Upload codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}