Selaa lähdekoodia

fix: update reusable workflow references to use master branch

Shun Miyazawa 8 kuukautta sitten
vanhempi
sitoutus
1465d4ad7f
2 muutettua tiedostoa jossa 4 lisäystä ja 8 poistoa
  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:
 
   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: |
       ( github.event_name == 'push'
         || github.base_ref == 'master'
@@ -55,7 +55,7 @@ jobs:
 
 
   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: |
       ( github.event_name == 'push'
         || github.base_ref == 'master'

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

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