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

Revert "test ci"

This reverts commit 971ac62a23adac1a8e7d02c372e4f5d3a37688c2.
Shun Miyazawa 7 месяцев назад
Родитель
Сommit
b45a32d683
2 измененных файлов с 4 добавлено и 8 удалено
  1. 2 2
      .github/workflows/ci-app-prod.yml
  2. 2 6
      .github/workflows/reusable-app-prod.yml

+ 2 - 2
.github/workflows/ci-app-prod.yml

@@ -40,7 +40,7 @@ concurrency:
 jobs:
 jobs:
 
 
   test-prod-node20:
   test-prod-node20:
-    - uses: weseek/growi/.github/workflows/reusable-app-prod.yml@support/170650-support-mongodb-v8-in-devcontainer
+    uses: weseek/growi/.github/workflows/reusable-app-prod.yml@master
     if: |
     if: |
       ( github.event_name == 'push'
       ( github.event_name == 'push'
         || github.base_ref == 'master'
         || github.base_ref == 'master'
@@ -55,7 +55,7 @@ jobs:
 
 
 
 
   test-prod-node22:
   test-prod-node22:
-    - uses: weseek/growi/.github/workflows/reusable-app-prod.yml@support/170650-support-mongodb-v8-in-devcontainer
+    uses: weseek/growi/.github/workflows/reusable-app-prod.yml@master
     if: |
     if: |
       ( github.event_name == 'push'
       ( github.event_name == 'push'
         || github.base_ref == 'master'
         || github.base_ref == 'master'

+ 2 - 6
.github/workflows/reusable-app-prod.yml

@@ -171,13 +171,9 @@ jobs:
   run-playwright:
   run-playwright:
     needs: [build-prod]
     needs: [build-prod]
 
 
-    # if: |
-    #       github.event_name == 'workflow_dispatch' ||
-    #       (!inputs.skip-e2e-test && startsWith(github.head_ref, 'mergify/merge-queue/'))
-
-    # for debugging
     if: |
     if: |
-      github.event_name == 'workflow_dispatch' || !inputs.skip-e2e-test
+      github.event_name == 'workflow_dispatch' ||
+      (!inputs.skip-e2e-test && startsWith(github.head_ref, 'mergify/merge-queue/'))
 
 
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
     container:
     container: