Yuki Takei 4 лет назад
Родитель
Сommit
1c7a78a22a
2 измененных файлов с 4 добавлено и 7 удалено
  1. 2 6
      .github/workflows/ci-app-prod.yml
  2. 2 1
      .github/workflows/pr-to-master.yml

+ 2 - 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 }}
@@ -41,9 +39,7 @@ jobs:
 
     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' ))
+      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