fix: use proper path and node version in actions

npm · Mar 17, 2022 · d5d546e · d5d546e
1 parent c6f6368
commit d5d546e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -78,7 +78,7 @@ jobs:
           git config --global user.name "npm cli ops bot"
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: ${{ matrix.node-version }}
       - name: Update to workable npm (windows)
         # node 12 and 14 ship with npm@6, which is known to fail when updating itself in windows
         if: matrix.platform.os == 'windows-latest' && (startsWith(matrix.node-version, '12') || startsWith(matrix.node-version, '14'))

diff --git a/lib/content/ci.yml b/lib/content/ci.yml
@@ -7,7 +7,7 @@ on:
       - '*'
     {{#if pkgRelPath}}
     paths:
-      - {{pkgRelPath}}
+      - {{pkgRelPath}}/**
     {{/if}}
   push:
     branches:
@@ -16,7 +16,7 @@ on:
       {{/each}}
     {{#if pkgRelPath}}
     paths:
-      - {{pkgRelPath}}
+      - {{pkgRelPath}}/**
     {{/if}}
   schedule:
     # "At 02:00 on Monday" https://crontab.guru/#0_2_*_*_1
@@ -54,6 +54,6 @@ jobs:
         shell: $\{{ matrix.platform.shell }}
     steps:
       {{> setupGit}}
-      {{> setupNode}}
+      {{> setupNode nodeVersion="${{ matrix.node-version }}"}}
       - run: npm i
       - run: npm test --ignore-scripts {{~#if isWorkspace}} -w {{pkgName}}{{/if}}
diff --git a/lib/content/setup-node.yml b/lib/content/setup-node.yml
@@ -1,6 +1,6 @@
 - uses: actions/setup-node@v3
   with:
-    node-version: {{#each ciVersions}}{{#if @last}}{{.}}{{/if}}{{/each}}
+    node-version: {{#if nodeVersion}}{{nodeVersion}}{{else}}{{#each ciVersions}}{{#if @last}}{{.}}{{/if}}{{/each}}{{/if}}
 - name: Update to workable npm (windows)
   # node 12 and 14 ship with npm@6, which is known to fail when updating itself in windows
   if: matrix.platform.os == 'windows-latest' && (startsWith(matrix.node-version, '12') || startsWith(matrix.node-version, '14'))

diff --git a/tap-snapshots/test/apply/full-content.js.test.cjs b/tap-snapshots/test/apply/full-content.js.test.cjs
@@ -252,7 +252,7 @@ jobs:
           git config --global user.name "npm cli ops bot"
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: \${{ matrix.node-version }}
       - name: Update to workable npm (windows)
         # node 12 and 14 ship with npm@6, which is known to fail when updating itself in windows
         if: matrix.platform.os == 'windows-latest' && (startsWith(matrix.node-version, '12') || startsWith(matrix.node-version, '14'))
@@ -721,13 +721,13 @@ on:
     branches:
       - '*'
     paths:
-      - workspaces/b
+      - workspaces/b/**
   push:
     branches:
       - main
       - latest
     paths:
-      - workspaces/b
+      - workspaces/b/**
   schedule:
     # "At 02:00 on Monday" https://crontab.guru/#0_2_*_*_1
     - cron: "0 2 * * 1"
@@ -795,7 +795,7 @@ jobs:
           git config --global user.name "npm cli ops bot"
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: \${{ matrix.node-version }}
       - name: Update to workable npm (windows)
         # node 12 and 14 ship with npm@6, which is known to fail when updating itself in windows
         if: matrix.platform.os == 'windows-latest' && (startsWith(matrix.node-version, '12') || startsWith(matrix.node-version, '14'))
@@ -829,13 +829,13 @@ on:
     branches:
       - '*'
     paths:
-      - workspaces/a
+      - workspaces/a/**
   push:
     branches:
       - main
       - latest
     paths:
-      - workspaces/a
+      - workspaces/a/**
   schedule:
     # "At 02:00 on Monday" https://crontab.guru/#0_2_*_*_1
     - cron: "0 2 * * 1"
@@ -903,7 +903,7 @@ jobs:
           git config --global user.name "npm cli ops bot"
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: \${{ matrix.node-version }}
       - name: Update to workable npm (windows)
         # node 12 and 14 ship with npm@6, which is known to fail when updating itself in windows
         if: matrix.platform.os == 'windows-latest' && (startsWith(matrix.node-version, '12') || startsWith(matrix.node-version, '14'))
@@ -1007,7 +1007,7 @@ jobs:
           git config --global user.name "npm cli ops bot"
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: \${{ matrix.node-version }}
       - name: Update to workable npm (windows)
         # node 12 and 14 ship with npm@6, which is known to fail when updating itself in windows
         if: matrix.platform.os == 'windows-latest' && (startsWith(matrix.node-version, '12') || startsWith(matrix.node-version, '14'))

diff --git a/tap-snapshots/test/check/diffs.js.test.cjs b/tap-snapshots/test/check/diffs.js.test.cjs
@@ -299,7 +299,7 @@ The repo file ci.yml needs to be updated:
              git config --global user.name "npm cli ops bot"
          - uses: actions/setup-node@v3
            with:
-             node-version: 16.x
+             node-version: \${{ matrix.node-version }}
   +      - name: Update to workable npm (windows)
   +        # node 12 and 14 ship with npm@6, which is known to fail when updating itself in windows
   +        if: matrix.platform.os == 'windows-latest' && (startsWith(matrix.node-version, '12') || startsWith(matrix.node-version, '14'))