Browse Source

Merge branch 'master' into support/commonize-browser-detection

Yuki Takei 4 years ago
parent
commit
5cd9e94775

+ 3 - 6
.github/workflows/ci-app-prod.yml

@@ -24,9 +24,7 @@ jobs:
     uses: weseek/growi/.github/workflows/reusable-app-prod.yml@master
     with:
       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' ) }}
       cypress-report-artifact-name: Cypress report
     secrets:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
@@ -37,12 +35,11 @@ jobs:
 
     uses: weseek/growi/.github/workflows/reusable-app-reg-suit.yml@master
 
-    if: |
-      !contains( github.event.pull_request.labels.*.name, 'dependencies' ) &&
-      !contains( github.event.pull_request.labels.*.name, 'github_actions' )
+    if: always()
 
     with:
       node-version: 16.x
+      skip-reg-suit: ${{ !contains( github.event.pull_request.labels.*.name, 'dependencies' ) && !contains( github.event.pull_request.labels.*.name, 'github_actions' ) }}
       cypress-report-artifact-name: Cypress report
     secrets:
       REG_NOTIFY_GITHUB_PLUGIN_CLIENTID: ${{ secrets.REG_NOTIFY_GITHUB_PLUGIN_CLIENTID }}

+ 2 - 1
.github/workflows/pr-to-master.yml

@@ -13,7 +13,8 @@ jobs:
   auto-labeling:
     runs-on: ubuntu-latest
 
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'exclude from changelog') }}
+    if: |
+      !contains(github.event.pull_request.labels.*.name, 'exclude from changelog')
 
     steps:
       - uses: release-drafter/release-drafter@v5

+ 4 - 0
.github/workflows/reusable-app-reg-suit.yml

@@ -9,6 +9,8 @@ on:
       checkout-ref:
         type: string
         default: ${{ github.head_ref }}
+      skip-reg-suit:
+        type: boolean
       cypress-report-artifact-name:
         required: true
         type: string
@@ -33,6 +35,8 @@ jobs:
     # https://github.com/weseek/growi/settings/environments/376165508/edit
     environment: VRT
 
+    if: ${{ !inputs.skip-reg-suit }}
+
     env:
       REG_NOTIFY_GITHUB_PLUGIN_CLIENTID: ${{ secrets.REG_NOTIFY_GITHUB_PLUGIN_CLIENTID }}
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}