Merge branch 'main' into renovate/main-minor-dependencies

longhorn · Sep 24, 2024 · f9e844c · f9e844c
2 parents e800613 + ea0f8b6
commit f9e844c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -1,7 +1,7 @@
 pull_request_rules:
 - name: Automatically merge PRs
   conditions:
-  - check-success=continuous-integration/drone/pr
+  - check-success=build
   - "#approved-reviews-by>=2"
   - approved-reviews-by=@longhorn/maintainer
   actions:
@@ -10,15 +10,15 @@ pull_request_rules:
 
 - name: Automatically merge Renovate PRs
   conditions:
-  - check-success=continuous-integration/drone/pr
+  - check-success=build
   - author = renovate[bot]
   actions:
     merge:
       method: rebase
 
 - name: Automatically approve Renovate PRs
   conditions:
-  - check-success=continuous-integration/drone/pr
+  - check-success=build
   - author = renovate[bot]
   actions:
     review:

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -6,7 +6,7 @@ on:
   pull_request:
 jobs:
   build:
-    name: Build images
+    name: build
     runs-on: ubuntu-latest
     container:
       image: rancher/dapper:v0.6.0