resolve conflicts cherry-picking abda65ac7d

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

@@ -3,7 +3,7 @@ name: Node CI for app production
 on:
   push:
     branches:
-      - master
+      - dev/5.1.x
     paths:
       - .github/workflows/ci-app-prod.yml
       - .github/workflows/reusable-app-prod.yml
@@ -47,7 +47,7 @@ on:
 jobs:
 
   test-prod-node14:
-    uses: weseek/growi/.github/workflows/reusable-app-prod.yml@master
+    uses: weseek/growi/.github/workflows/reusable-app-prod.yml@dev/5.1.x
     with:
       node-version: 14.x
       skip-cypress: true
@@ -56,7 +56,7 @@ jobs:
 
 
   test-prod-node16:
-    uses: weseek/growi/.github/workflows/reusable-app-prod.yml@master
+    uses: weseek/growi/.github/workflows/reusable-app-prod.yml@dev/5.1.x
     with:
       node-version: 16.x
       skip-cypress: ${{ contains( github.event.pull_request.labels.*.name, 'dependencies' ) && contains( github.event.pull_request.labels.*.name, 'github_actions' ) }}
@@ -69,7 +69,7 @@ jobs:
   run-reg-suit-node16:
     needs: [test-prod-node16]
 
-    uses: weseek/growi/.github/workflows/reusable-app-reg-suit.yml@master
+    uses: weseek/growi/.github/workflows/reusable-app-reg-suit.yml@dev/5.1.x
 
     if: always()