diff --git a/.github/workflows/release-integration.yml b/.github/workflows/release-integration.yml index 1580c1bd..57521b74 100644 --- a/.github/workflows/release-integration.yml +++ b/.github/workflows/release-integration.yml @@ -18,6 +18,7 @@ on: jobs: publish: + name: Check Publish runs-on: ubuntu-latest defaults: run: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cc24fcfa..fe6e2900 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -229,9 +229,9 @@ jobs: const runUrl = `https://github.com/${owner}/${repo}/actions/runs/${runId}` return [ - '## Release Workflow\n' + '## Release Workflow\n', ...releases.map(r => `- \`${r.pkgName}@${r.version}\` ${r.url}`), - `- Workflow run: :arrows_counterclockwise: ${runUrl}` + `- Workflow run: :arrows_counterclockwise: ${runUrl}`, ].join('\n') - name: Create Release PR Comment id: create-comment @@ -286,14 +286,16 @@ jobs: result-encoding: string script: | const { RESULT, BODY } = process.env - let body = BODY.replace(/Workflow run: :[a-z_]+:/, `Workflow run: :${RESULT}:`) + const body = BODY.replace(/(Workflow run: :)[a-z_]+(:)/, `$1${RESULT}$2`) + const append = [] if (RESULT !== 'white_check_mark') { - body += `\n\n:rotating_light:` - body += ` @npm/cli-team: The post-release workflow failed for this release.` - body += ` Manual steps may need to be taken after examining the workflow output` - body += ` from the above workflow run. :rotating_light:` + append.push(':rotating_light:') + append.push('@npm/cli-team:') + append.push('The post-release workflow failed for this release.') + append.push('Manual steps may need to be taken after examining the workflow output from the above workflow run.') + append.push(':rotating_light:') } - return body + return [body, append.join(' ')].join('\n\n').trim() - name: Update Release PR Comment if: steps.comment-text.outputs.result uses: peter-evans/create-or-update-comment@v3 diff --git a/package-lock.json b/package-lock.json index 38b28f9a..d97de1d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:scripts/npmcli-template-oss-23566.tgz", "tap": "^16.3.4" }, "engines": { @@ -2273,8 +2273,8 @@ }, "node_modules/@npmcli/template-oss": { "version": "4.20.0", - "resolved": "file:scripts/npmcli-template-oss-31058.tgz", - "integrity": "sha512-0zTUL9YXhC2PysP4Q6HQlBf9xiIcIJbypFGdb+oEk1KmA2ASrTbdofpY8NloZbFxolhvtKVQakS3KntUr6co+Q==", + "resolved": "file:scripts/npmcli-template-oss-23566.tgz", + "integrity": "sha512-UU0cwnR0dtwagcAhfwC3WnXX0lXo2pHDsvQ2f8FiZV3DhHLKjJzNNBontpn21tg43ZtuYIlJ2TtJ4hKkLzY2qQ==", "dev": true, "hasInstallScript": true, "license": "ISC", @@ -12685,7 +12685,7 @@ "license": "ISC", "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:../scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:../scripts/npmcli-template-oss-23566.tgz", "pkg2": "^5.0.1", "tap": "^16.3.4" }, @@ -12701,7 +12701,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:../scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:../scripts/npmcli-template-oss-23566.tgz", "tap": "^16.3.4" }, "engines": { @@ -12714,7 +12714,7 @@ "license": "ISC", "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:../scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:../scripts/npmcli-template-oss-23566.tgz", "tap": "^16.3.4" }, "engines": { @@ -12727,7 +12727,7 @@ "license": "ISC", "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:../../scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:../../scripts/npmcli-template-oss-23566.tgz", "tap": "^16.3.4" }, "engines": { @@ -12740,7 +12740,7 @@ "license": "ISC", "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:../../scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:../../scripts/npmcli-template-oss-23566.tgz", "tap": "^16.3.4" }, "engines": { @@ -12753,7 +12753,7 @@ "license": "ISC", "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:../../scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:../../scripts/npmcli-template-oss-23566.tgz", "tap": "^16.3.4" }, "engines": { diff --git a/package.json b/package.json index 12556627..c6dcccae 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ ], "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:scripts/npmcli-template-oss-23566.tgz", "tap": "^16.3.4" }, "files": [ diff --git a/pkg1/package.json b/pkg1/package.json index 81243a64..e1208b40 100644 --- a/pkg1/package.json +++ b/pkg1/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:../scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:../scripts/npmcli-template-oss-23566.tgz", "pkg2": "^5.0.1", "tap": "^16.3.4" }, diff --git a/pkg2/package.json b/pkg2/package.json index 3a5b9356..62906f8f 100644 --- a/pkg2/package.json +++ b/pkg2/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:../scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:../scripts/npmcli-template-oss-23566.tgz", "tap": "^16.3.4" }, "dependencies": { diff --git a/pkg3/package.json b/pkg3/package.json index c1109e01..c457393d 100644 --- a/pkg3/package.json +++ b/pkg3/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:../scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:../scripts/npmcli-template-oss-23566.tgz", "tap": "^16.3.4" }, "tap": { diff --git a/scripts/npmcli-template-oss-23566.tgz b/scripts/npmcli-template-oss-23566.tgz new file mode 100644 index 00000000..0b7ba868 Binary files /dev/null and b/scripts/npmcli-template-oss-23566.tgz differ diff --git a/scripts/npmcli-template-oss-31058.tgz b/scripts/npmcli-template-oss-31058.tgz deleted file mode 100644 index a9c45753..00000000 Binary files a/scripts/npmcli-template-oss-31058.tgz and /dev/null differ diff --git a/workspaces/arbitrary-name/package.json b/workspaces/arbitrary-name/package.json index 3a83a56b..b531a6b7 100644 --- a/workspaces/arbitrary-name/package.json +++ b/workspaces/arbitrary-name/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:../../scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:../../scripts/npmcli-template-oss-23566.tgz", "tap": "^16.3.4" }, "tap": { diff --git a/workspaces/not-the-name/package.json b/workspaces/not-the-name/package.json index 8ec8667d..490919f7 100644 --- a/workspaces/not-the-name/package.json +++ b/workspaces/not-the-name/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:../../scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:../../scripts/npmcli-template-oss-23566.tgz", "tap": "^16.3.4" }, "tap": { diff --git a/workspaces/pkg6/package.json b/workspaces/pkg6/package.json index 6a64bee5..bed9091c 100644 --- a/workspaces/pkg6/package.json +++ b/workspaces/pkg6/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "file:../../scripts/npmcli-template-oss-31058.tgz", + "@npmcli/template-oss": "file:../../scripts/npmcli-template-oss-23566.tgz", "tap": "^16.3.4" }, "tap": {