Merge pull request #88 from universal-ember/update-release-plan

Update release-plan

.github/workflows/plan-release.yml

@@ -46,28 +46,42 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         # We need to download lots of history so that
-        # lerna-changelog can discover what's changed since the last release
+        # github-changelog can discover what's changed since the last release
         with:
           fetch-depth: 0
-      - uses: wyvox/action-setup-pnpm@v3
-
+          ref: 'main'
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 8
+      - run: pnpm install --frozen-lockfile
+
       - name: "Generate Explanation and Prep Changelogs"
         id: explanation
         run: |
-          set -x
-
-          pnpm release-plan prepare
+          set +e
+          
+          pnpm release-plan prepare 2> >(tee -a stderr.log >&2)
+          
 
-          echo 'text<<EOF' >> $GITHUB_OUTPUT
-          jq .description .release-plan.json -r >> $GITHUB_OUTPUT
-          echo 'EOF' >> $GITHUB_OUTPUT
+          if [ $? -ne 0 ]; then
+            echo 'text<<EOF' >> $GITHUB_OUTPUT
+            cat stderr.log >> $GITHUB_OUTPUT
+            echo 'EOF' >> $GITHUB_OUTPUT
+          else
+            echo 'text<<EOF' >> $GITHUB_OUTPUT
+            jq .description .release-plan.json -r >> $GITHUB_OUTPUT
+            echo 'EOF' >> $GITHUB_OUTPUT
+          fi
         env:
           GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: peter-evans/create-pull-request@v6
         with:
           commit-message: "Prepare Release using 'release-plan'"
-          author: "github-actions[bot] <[email protected]>"
           labels: "internal"
           branch: release-preview
           title: Prepare Release

.github/workflows/publish.yml

@@ -1,6 +1,6 @@
 # For every push to the master branch, this checks if the release-plan was
 # updated and if it was it will publish stable npm packages based on the
-# release plan
+# release plan
 
 name: Publish Stable
 
@@ -37,20 +37,26 @@ jobs:
     name: "NPM Publish"
     runs-on: ubuntu-latest
     needs: check-plan
+    if: needs.check-plan.outputs.command == 'release'
     permissions:
       contents: write
       pull-requests: write
-    if: needs.check-plan.outputs.command == 'release'
 
     steps:
       - uses: actions/checkout@v4
-      - uses: wyvox/action-setup-pnpm@v3
+      - uses: actions/setup-node@v4
         with:
+          node-version: 18
           # This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
-          node-registry-url: 'https://registry.npmjs.org'
+          registry-url: 'https://registry.npmjs.org'
+
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 8
+      - run: pnpm install --frozen-lockfile
       - name: npm publish
         run: pnpm release-plan publish
-
+      
         env:
           GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

RELEASE.md

@@ -1,6 +1,6 @@
 # Release Process
 
-Releases in this repo are mostly automated using [release-plan](https://github.com/embroider-build/release-plan/). Once you label all your PRs correctly (see below) you will have an automatically generated PR that updates your CHANGELOG.md file and a `.release-plan.json` that is used prepare the release once the PR is merged.
+Releases in this repo are mostly automated using [release-plan](https://github.com/embroider-build/release-plan/). Once you label all your PRs correctly (see below) you will have an automatically generated PR that updates your CHANGELOG.md file and a `.release-plan.json` that is used to prepare the release once the PR is merged.
 
 ## Preparation
 

package.json

@@ -21,7 +21,7 @@
     "concurrently": "^8.2.2",
     "prettier": "^3.0.3",
     "prettier-plugin-ember-template-tag": "^2.0.0",
-    "release-plan": "^0.7.0"
+    "release-plan": "^0.8.0"
   },
   "volta": {
     "node": "20.11.1",