@npmcli/template-oss 4.3.0 → 4.3.2

package/lib/config.js

@@ -216,9 +216,13 @@ const getFullConfig = async ({
   }
 
   if (pkgConfig.ciVersions) {
-    const versions = pkgConfig.ciVersions
-    const defaultVersions = defaultConfig.ciVersions
-    const parsed = parseCIVersions(versions === 'latest' ? defaultVersions.slice(-1) : versions)
+    let versions = pkgConfig.ciVersions
+    if (versions === 'latest') {
+      const defaultVersions = [rootPkgConfig, defaultConfig].find(c => Array.isArray(c.ciVersions))
+      versions = defaultVersions.ciVersions.slice(-1)
+    }
+
+    const parsed = parseCIVersions(versions)
     derived.ciVersions = parsed.targets
     derived.engines = pkgConfig.engines || parsed.engines
   }

package/lib/content/_job-matrix.yml

@@ -1,4 +1,4 @@
-name: {{ jobName }}
+name: {{ jobName }} - $\{{ matrix.platform.name }} - $\{{ matrix.node-version }}
 if: github.repository_owner == 'npm'
 strategy:
   fail-fast: false
@@ -26,4 +26,4 @@ defaults:
   run:
     shell: $\{{ matrix.platform.shell }}
 steps:
-  {{> stepsSetup jobNodeMatrix=true }}
+  {{> stepsSetup jobIsMatrix=true }}

package/lib/content/_step-checks.yml

@@ -10,7 +10,7 @@
     token: $\{{ secrets.GITHUB_TOKEN }}
     {{#if jobCheck.sha}}
     status: {{#if jobCheck.status}}{{ jobCheck.status }}{{else}}in_progress{{/if}} 
-    name: {{#if jobCheck.name}}{{ jobCheck.name }}{{else}}{{ jobName }}{{/if}}
+    name: {{#if jobCheck.name}}{{ jobCheck.name }}{{else}}{{ jobName }}{{/if}}{{#if jobIsMatrix}} - $\{{ matrix.platform.name }} - $\{{ matrix.node-version }}{{/if}}
     sha: {{ jobCheck.sha }}
     # XXX: this does not work when using the default GITHUB_TOKEN.
     # Instead we post the main job url to the PR as a comment which

package/lib/content/_step-node.yml

@@ -1,12 +1,12 @@
 - name: Setup Node
   uses: actions/setup-node@v3
   with:
-    node-version: {{#if jobNodeMatrix}}$\{{ matrix.node-version }}{{else}}{{ last ciVersions }}{{/if}}
+    node-version: {{#if jobIsMatrix}}$\{{ matrix.node-version }}{{else}}{{ last ciVersions }}{{/if}}
     {{#if lockfile}}
     cache: npm
     {{/if}}
 {{#if updateNpm}}
-{{#if jobNodeMatrix}}
+{{#if jobIsMatrix}}
 - name: Update Windows npm
   # 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.'))

package/lib/content/ci-release.yml

@@ -23,7 +23,7 @@ jobs:
 
   test-all:
     {{> jobMatrix
-      jobName="Test All - ${{ matrix.platform.name }} - Node ${{ matrix.node-version }}"
+      jobName="Test All"
       jobCheck=(obj sha="${{ inputs.check-sha }}")
       jobCheckout=(obj ref="${{ inputs.ref }}")
     }}

package/lib/content/ci.yml

@@ -9,5 +9,5 @@ jobs:
       {{> stepLint jobRunFlags=pkgFlags }}
 
   test:
-    {{> jobMatrix jobName="Test All - ${{ matrix.platform.name }} - Node ${{ matrix.node-version }}" }}
+    {{> jobMatrix jobName="Test" }}
       {{> stepTest jobRunFlags=pkgFlags }}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "4.3.0",
+  "version": "4.3.2",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {