Sort out all these workflow inputs.

johnbillion · Jun 14, 2024 · c57d7e6 · c57d7e6
1 parent 9ac0865
commit c57d7e6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -62,5 +62,6 @@ jobs:
       fail-fast: false
     uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-acceptance-tests.yml@trunk
     with:
-      wp: ${{ matrix.wp }}
+      node: true
       php: ${{ matrix.php }}
+      wp: ${{ matrix.wp }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,4 +15,6 @@ jobs:
     name: Build
     uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-build.yml@trunk
     with:
+      node: true
       tag: ${{ github.event_name != 'workflow_dispatch' }}
+      vendor: true
diff --git a/.github/workflows/deploy-assets.yml b/.github/workflows/deploy-assets.yml
@@ -14,8 +14,10 @@ jobs:
     name: WordPress.org
     uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-deploy-assets.yml@trunk
     with:
+      node: true
       plugin: query-monitor
       readme: readme.txt
+      vendor: true
     secrets:
       WPORG_SVN_USERNAME: ${{ secrets.WPORG_SVN_USERNAME }}
       WPORG_SVN_PASSWORD: ${{ secrets.WPORG_SVN_PASSWORD }}
diff --git a/.github/workflows/deploy-tag.yml b/.github/workflows/deploy-tag.yml
@@ -22,10 +22,10 @@ jobs:
     name: Deploy Tag
     uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-deploy-tag.yml@trunk
     with:
+      deploy: ${{ github.event_name != 'workflow_dispatch' }}
       plugin: query-monitor
       readme: readme.txt
       version: ${{ github.event_name != 'workflow_dispatch' && github.event.release.tag_name || github.event.inputs.version }}
-      deploy: ${{ github.event_name != 'workflow_dispatch' }}
     secrets:
       WPORG_SVN_USERNAME: ${{ secrets.WPORG_SVN_USERNAME }}
       WPORG_SVN_PASSWORD: ${{ secrets.WPORG_SVN_PASSWORD }}
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -62,5 +62,6 @@ jobs:
             php: '7.4'
       fail-fast: false
     with:
-      wp: ${{ matrix.wp }}
+      node: true
       php: ${{ matrix.php }}
+      wp: ${{ matrix.wp }}
diff --git a/.github/workflows/nightly-tests.yml b/.github/workflows/nightly-tests.yml
@@ -35,8 +35,9 @@ jobs:
       fail-fast: false
     uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-acceptance-tests.yml@trunk
     with:
-      wp: 'nightly'
+      node: true
       php: ${{ matrix.php }}
+      wp: 'nightly'
   integration:
     name: Nightly integration / PHP ${{ matrix.php }}
     uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-integration-tests.yml@trunk
@@ -47,5 +48,6 @@ jobs:
           - '7.4'
       fail-fast: false
     with:
-      wp: 'nightly'
+      node: true
       php: ${{ matrix.php }}
+      wp: 'nightly'