Просмотр исходного кода

add mergify queue configurations

Yuki Takei 1 год назад
Родитель
Сommit
7d0ccf2e8e
2 измененных файлов с 20 добавлено и 9 удалено
  1. 19 8
      .github/mergify.yml
  2. 1 1
      .github/workflows/reusable-app-prod.yml

+ 19 - 8
.github/mergify.yml

@@ -1,16 +1,27 @@
+queue_rules:
+  - name: default
+    allow_inplace_checks: false
+    queue_conditions:
+      - '#approved-reviews-by >= 2'
+      - check-success = "check-title"
+      - check-success = "Node CI for slackbot-proxy"
+      - check-success = "Node CI for app development"
+    merge_conditions:
+      - '#approved-reviews-by >= 2'
+      - check-success = "check-title"
+      - check-success = "Node CI for slackbot-proxy"
+      - check-success = "Node CI for app development"
+      - check-success = "Node CI for app production"
+
 pull_request_rules:
 pull_request_rules:
   - name: Automatic merge for Dependabot pull requests
   - name: Automatic merge for Dependabot pull requests
     conditions:
     conditions:
       - author = dependabot[bot]
       - author = dependabot[bot]
       - '#approved-reviews-by >= 1'
       - '#approved-reviews-by >= 1'
-      - check-success = "ci-slackbot-proxy-lint (20.x)"
-      - check-success = "ci-slackbot-proxy-launch-dev (20.x)"
-      - check-success = "ci-slackbot-proxy-launch-prod (20.x)"
-      - check-success = "ci-app-lint (20.x)"
-      - check-success = "ci-app-test (20.x)"
-      - check-success = "ci-app-launch-dev (20.x)"
-      - check-success = "test-prod-node18 / launch-prod"
-      - check-success = "test-prod-node20 / launch-prod"
+      - check-success = "check-title"
+      - check-success = "Node CI for slackbot-proxy"
+      - check-success = "Node CI for app development"
+      - check-success = "Node CI for app production"
     actions:
     actions:
       merge:
       merge:
         method: merge
         method: merge

+ 1 - 1
.github/workflows/reusable-app-prod.yml

@@ -199,7 +199,7 @@ jobs:
   run-playwright:
   run-playwright:
     needs: [build-prod]
     needs: [build-prod]
 
 
-    if: ${{ !inputs.skip-e2e-test }}
+    if: ${{ !inputs.skip-e2e-test && startsWith(github.head_ref, 'mergify/merge-queue/') }}
 
 
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
     container:
     container: