chore: @npmcli/[email protected]

brucejo75 · Nov 1, 2022 · 2293fb2 · 2293fb2
1 parent 9709ae6
commit 2293fb2
Show file tree

Hide file tree

Showing 19 changed files with 71 additions and 64 deletions.
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -3,6 +3,12 @@
 name: CI - Release
 
 on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        required: true
+        type: string
+        default: latest
   workflow_call:
     inputs:
       ref:
@@ -23,7 +29,7 @@ jobs:
     steps:
       - name: Get Workflow Job
         uses: actions/github-script@v6
-
+        if: inputs.check-sha
         id: check-output
         env:
           JOB_NAME: "Lint All"
@@ -57,7 +63,7 @@ jobs:
       - name: Create Check
         uses: LouisBrunner/[email protected]
         id: check
-
+        if: inputs.check-sha
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: in_progress
@@ -85,7 +91,7 @@ jobs:
         run: node . run postlint --ignore-scripts -ws -iwr --if-present
       - name: Conclude Check
         uses: LouisBrunner/[email protected]
-        if: always()
+        if: steps.check.outputs.check_id && always()
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           conclusion: ${{ job.status }}
@@ -121,7 +127,7 @@ jobs:
     steps:
       - name: Get Workflow Job
         uses: actions/github-script@v6
-
+        if: inputs.check-sha
         id: check-output
         env:
           JOB_NAME: "Test All"
@@ -155,7 +161,7 @@ jobs:
       - name: Create Check
         uses: LouisBrunner/[email protected]
         id: check
-
+        if: inputs.check-sha
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: in_progress
@@ -186,7 +192,7 @@ jobs:
         run: node scripts/git-dirty.js
       - name: Conclude Check
         uses: LouisBrunner/[email protected]
-        if: always()
+        if: steps.check.outputs.check_id && always()
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           conclusion: ${{ job.status }}
@@ -219,7 +225,7 @@ jobs:
     steps:
       - name: Get Workflow Job
         uses: actions/github-script@v6
-
+        if: inputs.check-sha
         id: check-output
         env:
           JOB_NAME: "Smoke Publish"
@@ -253,7 +259,7 @@ jobs:
       - name: Create Check
         uses: LouisBrunner/[email protected]
         id: check
-
+        if: inputs.check-sha
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: in_progress
@@ -288,7 +294,7 @@ jobs:
           SMOKE_PUBLISH_NPM=1 npm test -w smoke-tests --ignore-scripts
       - name: Conclude Check
         uses: LouisBrunner/[email protected]
-        if: always()
+        if: steps.check.outputs.check_id && always()
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           conclusion: ${{ job.status }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,6 +8,7 @@ on:
     branches:
       - main
       - latest
+      - release/v*
 
 permissions:
   contents: write
@@ -85,7 +86,7 @@ jobs:
             return commentId
       - name: Get Workflow Job
         uses: actions/github-script@v6
-        if: steps.release.outputs.pr-number
+        if: steps.release.outputs.pr-sha
         id: check-output
         env:
           JOB_NAME: "Release"
@@ -119,7 +120,7 @@ jobs:
       - name: Create Check
         uses: LouisBrunner/[email protected]
         id: check
-        if: steps.release.outputs.pr-number
+        if: steps.release.outputs.pr-sha
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: in_progress
@@ -173,7 +174,7 @@ jobs:
           echo "::set-output  name=sha::$(git rev-parse HEAD)"
       - name: Get Workflow Job
         uses: actions/github-script@v6
-
+        if: steps.commit.outputs.sha
         id: check-output
         env:
           JOB_NAME: "Update - Release"
@@ -207,7 +208,7 @@ jobs:
       - name: Create Check
         uses: LouisBrunner/[email protected]
         id: check
-
+        if: steps.commit.outputs.sha
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: in_progress
@@ -216,7 +217,7 @@ jobs:
           output: ${{ steps.check-output.outputs.result }}
       - name: Conclude Check
         uses: LouisBrunner/[email protected]
-        if: always()
+        if: needs.release.outputs.check-id && always()
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           conclusion: ${{ job.status }}
@@ -254,7 +255,7 @@ jobs:
           echo "::set-output name=result::$result"
       - name: Conclude Check
         uses: LouisBrunner/[email protected]
-        if: always()
+        if: needs.update.outputs.check-id && always()
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           conclusion: ${{ steps.needs-result.outputs.result }}

diff --git a/docs/package.json b/docs/package.json
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.6.2",
+    "@npmcli/template-oss": "4.7.1",
     "tap": "^16.0.1"
   },
   "author": "GitHub Inc.",
@@ -58,7 +58,7 @@
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
     "ciVersions": "latest",
     "engines": "^14.17.0 || ^16.13.0 || >=18.0.0",
-    "version": "4.6.2",
+    "version": "4.7.1",
     "content": "../scripts/template-oss/index.js"
   }
 }
diff --git a/package-lock.json b/package-lock.json
@@ -167,7 +167,7 @@
         "@npmcli/fs": "^3.0.0",
         "@npmcli/git": "^4.0.1",
         "@npmcli/promise-spawn": "^5.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "licensee": "^8.2.0",
         "nock": "^13.2.4",
         "npm-packlist": "^7.0.1",
@@ -195,7 +195,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "tap": "^16.0.1"
       },
       "engines": {
@@ -2365,9 +2365,9 @@
       }
     },
     "node_modules/@npmcli/template-oss": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-4.6.2.tgz",
-      "integrity": "sha512-DNFvLfh10McWruYmvulHFC/RjGZ/frFpecl0fBPPF+B3qvJn6jcKRt8///IWl+D+KS/aQKKx9o7bqtQWUjQ9ug==",
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-4.7.1.tgz",
+      "integrity": "sha512-nzMGV+y/hLAQs6Eu4aXvLt0FBCTJAuinfUnXJRg+u+wJI0TB/ytbhArVEjQCyMPz16RNVbYixRocjfsKoU9y5w==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -14024,7 +14024,7 @@
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
         "@npmcli/promise-spawn": "^5.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "minify-registry-metadata": "^2.2.0",
         "rimraf": "^3.0.2",
         "tap": "^16.0.1",
@@ -14079,7 +14079,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "benchmark": "^2.1.4",
         "chalk": "^4.1.0",
         "minify-registry-metadata": "^2.1.0",
@@ -14100,7 +14100,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "nock": "^13.2.4",
         "tap": "^16.0.1"
       },
@@ -14124,7 +14124,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "tap": "^16.0.1"
       },
       "engines": {
@@ -14150,7 +14150,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "bin-links": "^4.0.1",
         "minify-registry-metadata": "^2.2.0",
         "mkdirp": "^1.0.4",
@@ -14168,7 +14168,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "tap": "^16.0.1"
       },
       "engines": {
@@ -14184,7 +14184,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "nock": "^13.2.4",
         "tap": "^16.0.1"
       },
@@ -14201,7 +14201,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "minipass": "^3.1.1",
         "nock": "^13.2.4",
         "tap": "^16.0.1"
@@ -14221,7 +14221,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "nock": "^13.0.7",
         "spawk": "^1.7.1",
         "tap": "^16.0.1"
@@ -14242,7 +14242,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "libnpmpack": "^5.0.1",
         "lodash.clonedeep": "^4.5.0",
         "nock": "^13.2.4",
@@ -14260,7 +14260,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "nock": "^13.2.4",
         "tap": "^16.0.1"
       },
@@ -14277,7 +14277,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "nock": "^13.2.4",
         "tap": "^16.0.1"
       },
@@ -14297,7 +14297,7 @@
       },
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/template-oss": "4.6.2",
+        "@npmcli/template-oss": "4.7.1",
         "require-inject": "^1.4.4",
         "tap": "^16.0.1"
       },

diff --git a/package.json b/package.json
@@ -204,7 +204,7 @@
     "@npmcli/fs": "^3.0.0",
     "@npmcli/git": "^4.0.1",
     "@npmcli/promise-spawn": "^5.0.0",
-    "@npmcli/template-oss": "4.6.2",
+    "@npmcli/template-oss": "4.7.1",
     "licensee": "^8.2.0",
     "nock": "^13.2.4",
     "npm-packlist": "^7.0.1",
@@ -254,7 +254,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.6.2",
+    "version": "4.7.1",
     "content": "./scripts/template-oss/root.js"
   },
   "license": "Artistic-2.0",

diff --git a/scripts/template-oss/ci-release.yml b/scripts/template-oss/ci-release.yml
@@ -3,7 +3,7 @@
   smoke-publish:
     {{> jobMatrix
       jobName="Smoke Publish"
-      jobCheck=(obj sha="${{ inputs.check-sha }}")
+      jobCheck=(obj sha="inputs.check-sha")
       jobCheckout=(obj ref="${{ inputs.ref }}")
       windowsCI=false
     }}

diff --git a/smoke-tests/package.json b/smoke-tests/package.json
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
     "@npmcli/promise-spawn": "^5.0.0",
-    "@npmcli/template-oss": "4.6.2",
+    "@npmcli/template-oss": "4.7.1",
     "minify-registry-metadata": "^2.2.0",
     "rimraf": "^3.0.2",
     "tap": "^16.0.1",
@@ -30,7 +30,7 @@
   "license": "ISC",
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.6.2",
+    "version": "4.7.1",
     "content": "../scripts/template-oss/index.js"
   },
   "tap": {

diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.6.2",
+    "@npmcli/template-oss": "4.7.1",
     "benchmark": "^2.1.4",
     "chalk": "^4.1.0",
     "minify-registry-metadata": "^2.1.0",
@@ -102,7 +102,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.6.2",
+    "version": "4.7.1",
     "content": "../../scripts/template-oss/index.js"
   }
 }