@npmcli/template-oss 4.20.0 → 4.21.1

package/lib/content/action-install-latest-npm-yml.hbs

@@ -0,0 +1,56 @@
+name: 'Install Latest npm'
+description: 'Install the latest version of npm compatible with the Node version'
+inputs:
+  node:
+    description: 'Current Node version'
+    required: true
+runs:
+  using: "composite"
+  steps:
+    # node 10/12/14 ship with npm@6, which is known to fail when updating itself in windows
+    - name: Update Windows npm
+      if: |
+        runner.os == 'Windows' && (
+          startsWith(inputs.node, 'v10.') ||
+          startsWith(inputs.node, 'v12.') ||
+          startsWith(inputs.node, 'v14.')
+        )
+      shell: cmd
+      run: |
+        curl -sO https://registry.npmjs.org/npm/-/npm-7.5.4.tgz
+        tar xf npm-7.5.4.tgz
+        cd package
+        node lib/npm.js install --no-fund --no-audit -g ..\npm-7.5.4.tgz
+        cd ..
+        rmdir /s /q package
+    - name: Install Latest npm
+      shell: bash
+      env:
+        NODE_VERSION: $\{{ inputs.node }}
+      working-directory: $\{{ runner.temp }}
+      run: |
+        MATCH=""
+        SPECS=("latest" "next-10" "next-9" "next-8" "next-7" "next-6")
+
+        echo "node@$NODE_VERSION"
+
+        for SPEC in ${SPECS[@]}; do
+          ENGINES=$(npm view npm@$SPEC --json | jq -r '.engines.node')
+          echo "Checking if node@$NODE_VERSION satisfies npm@$SPEC ($ENGINES)"
+
+          if npx semver -r "$ENGINES" "$NODE_VERSION" > /dev/null; then
+            MATCH=$SPEC
+            echo "Found compatible version: npm@$MATCH"
+            break
+          fi  
+        done
+
+        if [ -z $MATCH ]; then
+          echo "Could not find a compatible version of npm for node@$NODE_VERSION"
+          exit 1
+        fi
+
+        npm i --prefer-online --no-fund --no-audit -g npm@$MATCH
+    - name: npm Version
+      shell: bash
+      run: npm -v

package/lib/content/ci-release-yml.hbs

@@ -21,17 +21,29 @@ jobs:
   lint-all:
     {{> jobYml
       jobName="Lint All"
-      jobCheck=(obj sha="inputs.check-sha")
       jobCheckout=(obj ref="${{ inputs.ref }}")
+      jobCreateCheck=(obj sha="${{ inputs.check-sha }}")
     }}
       {{> stepLintYml jobRunFlags=allFlags }}
-      {{> stepChecksYml jobCheck=true }}
+      - name: Conclude Check
+        uses: LouisBrunner/checks-action@v1.6.0
+        if: always()
+        with:
+          token: $\{{ secrets.GITHUB_TOKEN }}
+          conclusion: $\{{ job.status }}
+          check_id: $\{{ steps.create-check.outputs.check-id }}
 
   test-all:
     {{> jobMatrixYml
       jobName="Test All"
-      jobCheck=(obj sha="inputs.check-sha")
       jobCheckout=(obj ref="${{ inputs.ref }}")
+      jobCreateCheck=(obj sha="${{ inputs.check-sha }}")
     }}
       {{> stepTestYml jobRunFlags=allFlags }}
-      {{> stepChecksYml jobCheck=true }}
+      - name: Conclude Check
+        uses: LouisBrunner/checks-action@v1.6.0
+        if: always()
+        with:
+          token: $\{{ secrets.GITHUB_TOKEN }}
+          conclusion: $\{{ job.status }}
+          check_id: $\{{ steps.create-check.outputs.check-id }}

package/lib/content/index.js

@@ -12,6 +12,10 @@ const sharedRootAdd = (name) => ({
     file: 'ci-release-yml.hbs',
     filter: isPublic,
   },
+  '.github/workflows/release-integration.yml': {
+    file: 'release-integration-yml.hbs',
+    filter: isPublic,
+  },
   '.release-please-manifest.json': {
     file: 'release-please-manifest-json.hbs',
     filter: isPublic,
@@ -48,6 +52,9 @@ const sharedRootAdd = (name) => ({
     file: 'settings-yml.hbs',
     filter: (p) => !p.config.isReleaseBranch,
   },
+  // composite actions
+  '.github/actions/install-latest-npm/action.yml': 'action-install-latest-npm-yml.hbs',
+  '.github/actions/create-check/action.yml': 'action-create-check-yml.hbs',
 })
 
 const sharedRootRm = () => ({
@@ -140,11 +147,15 @@ module.exports = {
   branches: ['main', 'latest'],
   // set this to the major version to backport
   backport: null,
+  // this tag will be used for publishing when not prerelease or backport. use
+  // {{major}} to have the major version being published replaced in the string.
+  defaultPublishTag: 'latest',
   releaseBranch: 'release/v*',
   distPaths: [
     'bin/',
     'lib/',
   ],
+  allowDistPaths: true,
   allowPaths: [
     '/.eslintrc.local.*',
     '**/.gitignore',
@@ -188,10 +199,10 @@ module.exports = {
   },
   allowedPackages: [],
   changelogTypes: [
-    { type: 'feat', section: 'Features', hidden: false },
-    { type: 'fix', section: 'Bug Fixes', hidden: false },
-    { type: 'docs', section: 'Documentation', hidden: false },
-    { type: 'deps', section: 'Dependencies', hidden: false },
-    { type: 'chore', hidden: true },
+    { type: 'feat', section: 'Features', hidden: false, collapse: false },
+    { type: 'fix', section: 'Bug Fixes', hidden: false, collapse: false },
+    { type: 'docs', section: 'Documentation', hidden: false, collapse: false },
+    { type: 'deps', section: 'Dependencies', hidden: false, collapse: false },
+    { type: 'chore', section: 'Chores', hidden: false, collapse: true },
   ],
 }

package/lib/content/package-json.hbs

@@ -1,14 +1,14 @@
 {
   "author": "GitHub Inc.",
-  "files": {{#if typescript}}{{{ del }}}{{else}}{{{ json distPaths }}}{{/if}},
+  "files": {{{ json distPaths }}},
   "type": {{#if esm}}"module"{{else}}{{{ del }}}{{/if}},
   "scripts": {
     "lint": "{{#if eslint}}eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"{{else}}echo linting disabled{{/if}}",
     "postlint": "template-oss-check",
     "template-oss-apply": "template-oss-apply --force",
     "lintfix": "{{ localNpmPath }} run lint -- --fix",
-    "snap": "tap",
-    "test": "tap",
+    "snap": "{{#if typescript}}{{#if tap16}}c8 {{/if}}{{/if}}tap",
+    "test": "{{#if typescript}}{{#if tap16}}c8 {{/if}}{{/if}}tap",
     "posttest": "{{ localNpmPath }} run lint",
     {{#if isRootMono}}
     "test-all": "{{ localNpmPath }} run test {{ allFlags }}",
@@ -34,6 +34,16 @@
     {{#if workspacePaths}}
     "test-ignore": "^({{ join workspacePaths "|" }})/",
     {{/if}}
+    {{#if typescript}}
+    {{#if tap16}}
+    "coverage": false,
+    "node-arg": [
+      "--no-warnings",
+      "--loader",
+      "ts-node/esm"
+    ],
+    {{/if}}
+    {{/if}}
     "nyc-arg": {{#if tap18}}{{{ del }}}{{else}}[
       {{#each workspaceGlobs}}
       "--exclude",

package/lib/content/pull-request-yml.hbs

@@ -14,11 +14,9 @@ jobs:
       - name: Run Commitlint on Commits
         id: commit
         continue-on-error: true
-        run: |
-          {{ rootNpxPath }} --offline commitlint -V --from 'origin/$\{{ github.base_ref }}' --to $\{{ github.event.pull_request.head.sha }}
+        run: {{ rootNpxPath }} --offline commitlint -V --from 'origin/$\{{ github.base_ref }}' --to $\{{ github.event.pull_request.head.sha }}
       - name: Run Commitlint on PR Title
         if: steps.commit.outcome == 'failure'
         env:
           PR_TITLE: $\{{ github.event.pull_request.title }}
-        run: |
-          echo "$PR_TITLE" | {{ rootNpxPath }} --offline commitlint -V
+        run: echo "$PR_TITLE" | {{ rootNpxPath }} --offline commitlint -V

package/lib/content/release-integration-yml.hbs

@@ -0,0 +1,24 @@
+name: Release Integration
+
+on:
+  workflow_dispatch:
+    inputs:
+      releases:
+        required: true
+        type: string
+        description: 'A json array of releases. Required fields: publish: tagName, publishTag. publish check: pkgName, version'
+  workflow_call:
+    inputs:
+      releases:
+        required: true
+        type: string
+        description: 'A json array of releases. Required fields: publish: tagName, publishTag. publish check: pkgName, version'
+    {{#if publish}}
+    secrets:
+      PUBLISH_TOKEN:
+        required: true
+    {{/if}} 
+
+jobs:
+  publish:
+    {{> jobReleaseIntegrationYml }}

package/lib/content/release-please-config-json.hbs

@@ -1,13 +1,23 @@
 {
   "separate-pull-requests": {{{ del }}},
-  "plugins": {{#if isMonoPublic }}["node-workspace"]{{ else }}{{{ del }}}{{/if}},
-  "exclude-packages-from-root": true,
+  {{#if isMonoPublic }}
+  "plugins": [
+    "node-workspace",
+    "node-workspace-format"
+  ],
+  {{/if}}
+  "exclude-packages-from-root": {{{ del }}},
   "group-pull-request-title-pattern": "chore: release ${version}",
   "pull-request-title-pattern": "chore: release${component} ${version}",
   "changelog-sections": {{{ json changelogTypes }}},
+  "prerelease-type": "pre",
   "packages": {
     "{{ pkgPath }}": {
-      {{#if isRoot}}"package-name": ""{{/if}}
+      {{#if isRoot}}
+      "package-name": ""{{#if workspacePaths}},
+      "exclude-paths": {{{ json workspacePaths }}}
+      {{/if}}
+      {{/if}}
     }
   }
 }

package/lib/content/release-yml.hbs

@@ -1,11 +1,6 @@
 name: Release
 
 on:
-  workflow_dispatch:
-    inputs:
-      release-pr:
-        description: a release PR number to rerun release jobs on
-        type: string
   push:
     branches:
       {{#each branchPatterns}}
@@ -21,71 +16,85 @@ jobs:
   release:
     outputs:
       pr: $\{{ steps.release.outputs.pr }}
-      release: $\{{ steps.release.outputs.release }}
-      releases: $\{{ steps.release.outputs.releases }}
-      branch: $\{{ steps.release.outputs.pr-branch }}
+      pr-branch: $\{{ steps.release.outputs.pr-branch }}
       pr-number: $\{{ steps.release.outputs.pr-number }}
-      comment-id: $\{{ steps.pr-comment.outputs.result }}
-      check-id: $\{{ steps.check.outputs.check_id }}
+      pr-sha: $\{{ steps.release.outputs.pr-sha }}
+      releases: $\{{ steps.release.outputs.releases }}
+      comment-id: $\{{ steps.create-comment.outputs.comment-id || steps.update-comment.outputs.comment-id }}
+      check-id: $\{{ steps.create-check.outputs.check-id }}
     {{> jobYml jobName="Release" }}
       - name: Release Please
         id: release
         env:
           GITHUB_TOKEN: $\{{ secrets.GITHUB_TOKEN }}
-        run: |
-          {{ rootNpxPath }} --offline template-oss-release-please "$\{{ github.ref_name }}" "$\{{ inputs.release-pr }}"
-      - name: Post Pull Request Comment
+        run: {{ rootNpxPath }} --offline template-oss-release-please --branch="$\{{ github.ref_name }}" --backport="{{ backport }}" --defaultTag="{{ defaultPublishTag }}"
+      - name: Create Release Manager Comment Text
         if: steps.release.outputs.pr-number
         uses: actions/github-script@v6
-        id: pr-comment
-        env:
-          PR_NUMBER: $\{{ steps.release.outputs.pr-number }}
-          REF_NAME: $\{{ github.ref_name }}
+        id: comment-text
         with:
+          result-encoding: string
           script: |
-            const { REF_NAME, PR_NUMBER: issue_number } = process.env
             const { runId, repo: { owner, repo } } = context
-
             const { data: workflow } = await github.rest.actions.getWorkflowRun({ owner, repo, run_id: runId })
-
-            let body = '## Release Manager\n\n'
-
-            const comments = await github.paginate(github.rest.issues.listComments, { owner, repo, issue_number })
-            let commentId = comments.find(c => c.user.login === 'github-actions[bot]' && c.body.startsWith(body))?.id
-
-            body += `Release workflow run: ${workflow.html_url}\n\n#### Force CI to Update This Release\n\n`
-            body += `This PR will be updated and CI will run for every non-\`chore:\` commit that is pushed to \`${REF_NAME}\`. `
-            body += `To force CI to update this PR, run this command:\n\n`
-            body += `\`\`\`\ngh workflow run release.yml -r ${REF_NAME} -R ${owner}/${repo} -f release-pr=${issue_number}\n\`\`\``
-
-            if (commentId) {
-              await github.rest.issues.updateComment({ owner, repo, comment_id: commentId, body })
-            } else {
-              const { data: comment } = await github.rest.issues.createComment({ owner, repo, issue_number, body })
-              commentId = comment?.id
-            }
-
-            return commentId
-      {{> stepChecksYml jobCheck=(obj name="Release" sha="steps.release.outputs.pr-sha") }}
+            return['## Release Manager', `Release workflow run: ${workflow.html_url}`].join('\n\n')
+      - name: Find Release Manager Comment
+        uses: peter-evans/find-comment@v2
+        if: steps.release.outputs.pr-number
+        id: found-comment
+        with:
+          issue-number: $\{{ steps.release.outputs.pr-number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: '## Release Manager'
+      - name: Create Release Manager Comment
+        id: create-comment
+        if: steps.release.outputs.pr-number && !steps.found-comment.outputs.comment-id
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          issue-number: $\{{ steps.release.outputs.pr-number }}
+          body: $\{{ steps.comment-text.outputs.result }}
+      - name: Update Release Manager Comment
+        id: update-comment
+        if: steps.release.outputs.pr-number && steps.found-comment.outputs.comment-id
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          comment-id: $\{{ steps.found-comment.outputs.comment-id }}
+          body: $\{{ steps.comment-text.outputs.result }}
+          edit-mode: 'replace'
+      - name: Create Check
+        id: create-check
+        uses: ./.github/actions/create-check
+        if: steps.release.outputs.pr-sha
+        with:
+          name: "Release"
+          token: $\{{ secrets.GITHUB_TOKEN }}
+          sha: $\{{ steps.release.outputs.pr-sha }}
 
   update:
     needs: release
     outputs:
       sha: $\{{ steps.commit.outputs.sha }}
-      check-id: $\{{ steps.check.outputs.check_id }}
+      check-id: $\{{ steps.create-check.outputs.check-id }}
     {{> jobYml
       jobName="Update - Release"
       jobIf="needs.release.outputs.pr"
-      jobCheckout=(obj ref="${{ needs.release.outputs.branch }}" fetch-depth=0)
+      jobCheckout=(obj ref="${{ needs.release.outputs.pr-branch }}" fetch-depth=0)
     }}
+      - name: Create Release Manager Checklist Text
+        id: comment-text
+        env:
+          GITHUB_TOKEN: $\{{ secrets.GITHUB_TOKEN }}
+        run: {{ rootNpmPath }} exec --offline -- template-oss-release-manager --pr="$\{{ needs.release.outputs.pr-number }}" --backport="{{ backport }}" --defaultTag="{{ defaultPublishTag }}" {{~#if lockfile}} --lockfile{{/if}} {{~#if publish}} --publish{{/if}}
+      - name: Append Release Manager Comment
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          comment-id: $\{{ needs.release.outputs.comment-id }}
+          body: $\{{ steps.comment-text.outputs.result }}
+          edit-mode: 'append'
       - name: Run Post Pull Request Actions
         env:
-          RELEASE_PR_NUMBER: $\{{ needs.release.outputs.pr-number }}
-          RELEASE_COMMENT_ID: $\{{ needs.release.outputs.comment-id }}
           GITHUB_TOKEN: $\{{ secrets.GITHUB_TOKEN }}
-        run: |
-          {{ rootNpmPath }} exec --offline -- template-oss-release-manager --lockfile={{ lockfile }} --publish={{ publish }}
-          {{ rootNpmPath }} run rp-pull-request --ignore-scripts {{~#if allFlags}} {{ allFlags }}{{else}} --if-present{{/if}}
+        run: {{ rootNpmPath }} run rp-pull-request --ignore-scripts {{~#if allFlags}} {{ allFlags }}{{else}} --if-present{{/if}} -- --pr="$\{{ needs.release.outputs.pr-number }}" --commentId="$\{{ needs.release.outputs.comment-id }}"
       - name: Commit
         id: commit
         env:
@@ -94,8 +103,20 @@ jobs:
           git commit --all --amend --no-edit || true
           git push --force-with-lease
           echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-      {{> stepChecksYml jobName="Update - Release" jobCheck=(obj sha="steps.commit.outputs.sha" name="Release" )}}
-      {{> stepChecksYml jobCheck=(obj id="needs.release.outputs.check-id" )}}
+      - name: Create Check
+        id: create-check
+        uses: ./.github/actions/create-check
+        with:
+          name: "Update - Release"
+          check-name: "Release"
+          token: $\{{ secrets.GITHUB_TOKEN }}
+          sha: $\{{ steps.commit.outputs.sha }}
+      - name: Conclude Check
+        uses: LouisBrunner/checks-action@v1.6.0
+        with:
+          token: $\{{ secrets.GITHUB_TOKEN }}
+          conclusion: $\{{ job.status }}
+          check_id: $\{{ needs.release.outputs.check-id }}
 
   ci:
     name: CI - Release
@@ -103,14 +124,14 @@ jobs:
     if: needs.release.outputs.pr
     uses: ./.github/workflows/ci-release.yml
     with:
-      ref: $\{{ needs.release.outputs.branch }}
+      ref: $\{{ needs.release.outputs.pr-branch }}
       check-sha: $\{{ needs.update.outputs.sha }}
 
   post-ci:
     needs: [release, update, ci]
     {{> jobYml jobName="Post CI - Release" jobIf="needs.release.outputs.pr && always()" jobSkipSetup=true }}
-      - name: Get Needs Result
-        id: needs-result
+      - name: Get CI Conclusion
+        id: conclusion
         run: |
           result=""
           if [[ "$\{{ contains(needs.*.result, 'failure') }}" == "true" ]]; then
@@ -121,55 +142,62 @@ jobs:
             result="success"
           fi
           echo "result=$result" >> $GITHUB_OUTPUT
-      {{> stepChecksYml jobCheck=(obj id="needs.update.outputs.check-id" status="steps.needs-result.outputs.result") }}
+      - name: Conclude Check
+        uses: LouisBrunner/checks-action@v1.6.0
+        with:
+          token: $\{{ secrets.GITHUB_TOKEN }}
+          conclusion: $\{{ steps.conclusion.outputs.result }}
+          check_id: $\{{ needs.update.outputs.check-id }}
 
   post-release:
     needs: release
+    outputs:
+      comment-id: $\{{ steps.create-comment.outputs.comment-id }}
     {{> jobYml jobName="Post Release - Release" jobIf="needs.release.outputs.releases" jobSkipSetup=true  }}
-      - name: Create Release PR Comment
+      - name: Create Release PR Comment Text
+        id: comment-text
         uses: actions/github-script@v6
         env:
           RELEASES: $\{{ needs.release.outputs.releases }}
         with:
+          result-encoding: string
           script: |
             const releases = JSON.parse(process.env.RELEASES)
             const { runId, repo: { owner, repo } } = context
             const issue_number = releases[0].prNumber
-
-            let body = '## Release Workflow\n\n'
-            for (const { pkgName, version, url } of releases) {
-              body += `- \`${pkgName}@${version}\` ${url}\n`
-            }
-
-            const comments = await github.paginate(github.rest.issues.listComments, { owner, repo, issue_number })
-              .then(cs => cs.map(c => ({ id: c.id, login: c.user.login, body: c.body })))
-            console.log(`Found comments: ${JSON.stringify(comments, null, 2)}`)
-            const releaseComments = comments.filter(c => c.login === 'github-actions[bot]' && c.body.includes('Release is at'))
-
-            for (const comment of releaseComments) {
-              console.log(`Release comment: ${JSON.stringify(comment, null, 2)}`)
-              await github.rest.issues.deleteComment({ owner, repo, comment_id: comment.id })
-            }
-
             const runUrl = `https://github.com/${owner}/${repo}/actions/runs/${runId}`
-            await github.rest.issues.createComment({
-              owner,
-              repo,
-              issue_number,
-              body: `${body}- Workflow run: :arrows_counterclockwise: ${runUrl}`,
-            })
+
+            return [
+              '## Release Workflow\n',
+              ...releases.map(r => `- \`${r.pkgName}@${r.version}\` ${r.url}`),
+              `- Workflow run: :arrows_counterclockwise: ${runUrl}`,
+            ].join('\n')
+      - name: Create Release PR Comment
+        id: create-comment
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          issue-number: $\{{ fromJSON(needs.release.outputs.releases)[0].prNumber }}
+          body: $\{{ steps.comment-text.outputs.result }}
 
   release-integration:
     needs: release
     name: Release Integration
-    if: needs.release.outputs.release
-    {{> jobReleaseIntegrationYml }}
+    if: needs.release.outputs.releases
+    uses: ./.github/workflows/release-integration.yml
+    {{#if publish}}
+    permissions:
+      id-token: write
+    secrets:
+      PUBLISH_TOKEN: $\{{ secrets.PUBLISH_TOKEN }}
+    {{/if}}
+    with:
+      releases: $\{{ needs.release.outputs.releases }}
 
   post-release-integration:
-    needs: [release, release-integration]
-    {{> jobYml jobName="Post Release Integration - Release" jobIf="needs.release.outputs.release && always()" jobSkipSetup=true }}
-      - name: Get Needs Result
-        id: needs-result
+    needs: [release, release-integration, post-release]
+    {{> jobYml jobName="Post Release Integration - Release" jobIf="needs.release.outputs.releases && always()" jobSkipSetup=true }}
+      - name: Get Post Release Conclusion
+        id: conclusion
         run: |
           if [[ "$\{{ contains(needs.*.result, 'failure') }}" == "true" ]]; then
             result="x"
@@ -179,39 +207,39 @@ jobs:
             result="white_check_mark"
           fi
           echo "result=$result" >> $GITHUB_OUTPUT
-      - name: Update Release PR Comment
+      - name: Find Release PR Comment
+        uses: peter-evans/find-comment@v2
+        id: found-comment
+        with:
+          issue-number: $\{{ fromJSON(needs.release.outputs.releases)[0].prNumber }}
+          comment-author: 'github-actions[bot]'
+          body-includes: '## Release Workflow'
+      - name: Create Release PR Comment Text
+        id: comment-text
+        if: steps.found-comment.outputs.comment-id
         uses: actions/github-script@v6
         env:
-          PR_NUMBER: $\{{ fromJSON(needs.release.outputs.release).prNumber }}
-          RESULT: $\{{ steps.needs-result.outputs.result }}
+          RESULT: $\{{ steps.conclusion.outputs.result }}
+          BODY: $\{{ steps.found-comment.outputs.comment-body }}
         with:
+          result-encoding: string
           script: |
-            const { PR_NUMBER: issue_number, RESULT } = process.env
-            const { runId, repo: { owner, repo } } = context
-
-            const comments = await github.paginate(github.rest.issues.listComments, { owner, repo, issue_number })
-            const updateComment = comments.find(c =>
-              c.user.login === 'github-actions[bot]' &&
-              c.body.startsWith('## Release Workflow\n\n') &&
-              c.body.includes(runId)
-            )
-
-            if (updateComment) {
-              console.log('Found comment to update:', JSON.stringify(updateComment, null, 2))
-              let body = updateComment.body.replace(/Workflow run: :[a-z_]+:/, `Workflow run: :${RESULT}:`)
-              const tagCodeowner = RESULT !== 'white_check_mark'
-              if (tagCodeowner) {
-                body += `\n\n:rotating_light:`
-                body += ` {{ codeowner }}: 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:`
-              }
-              await github.rest.issues.updateComment({
-                owner,
-                repo,
-                body,
-                comment_id: updateComment.id,
-              })
-            } else {
-              console.log('No matching comments found:', JSON.stringify(comments, null, 2))
+            const { RESULT, BODY } = process.env
+            const body = [BODY.replace(/(Workflow run: :)[a-z_]+(:)/, `$1${RESULT}$2`)]
+            if (RESULT !== 'white_check_mark') {
+              body.push(':rotating_light::rotating_light::rotating_light:')
+              body.push([
+                '{{ codeowner }}: The post-release workflow failed for this release.',
+                'Manual steps may need to be taken after examining the workflow output.'
+              ].join(' '))
+              body.push(':rotating_light::rotating_light::rotating_light:')
             }
+            return body.join('\n\n').trim()
+      - name: Update Release PR Comment
+        if: steps.comment-text.outputs.result
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          comment-id: $\{{ steps.found-comment.outputs.comment-id }}
+          body: $\{{ steps.comment-text.outputs.result }}
+          edit-mode: 'replace'
+