Taichi Masuyama 3 лет назад
Родитель
Сommit
ecc3f40778
2 измененных файлов с 5 добавлено и 5 удалено
  1. 4 4
      .github/workflows/ci-app-prod.yml
  2. 1 1
      .github/workflows/release.yml

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

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

+ 1 - 1
.github/workflows/release.yml

@@ -114,7 +114,7 @@ jobs:
       uses: repo-sync/pull-request@v2
       uses: repo-sync/pull-request@v2
       with:
       with:
         source_branch: support/prepare-v${{ steps.package-json.outputs.packageVersion }}
         source_branch: support/prepare-v${{ steps.package-json.outputs.packageVersion }}
-        destination_branch: dev/5.1.x
+        destination_branch: master
         pr_title: Prepare v${{ steps.package-json.outputs.packageVersion }}
         pr_title: Prepare v${{ steps.package-json.outputs.packageVersion }}
         pr_label: exclude from changelog
         pr_label: exclude from changelog
         pr_body: "An automated PR generated by ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
         pr_body: "An automated PR generated by ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"