Merge pull request #1130 from NullVoxPopuli/update-release-plan

Update release-plan

Author: NullVoxPopuli

.github/workflows/plan-release.yml

@@ -5,7 +5,7 @@ on:
       - main
       - master
   pull_request:
-    types: 
+    types:
       - labeled
 
 concurrency:
@@ -34,6 +34,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     needs: check-plan
+    permissions:
+      contents: write
+      pull-requests: write
     outputs:
       explanation: ${{ steps.explanation.outputs.text }}
     # only run on push event if plan wasn't updated (don't create a release plan when we're releasing)
@@ -43,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
+          set +e
           
-          pnpm release-plan prepare
+          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@v5
+      - uses: peter-evans/create-pull-request@v6
         with:
           commit-message: "Prepare Release using 'release-plan'"
-          author: "github-actions[bot] <github-actions-bot@users.noreply.github.com>"
           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
 
@@ -38,13 +38,22 @@ jobs:
     runs-on: ubuntu-latest
     needs: check-plan
     if: needs.check-plan.outputs.command == 'release'
+    permissions:
+      contents: write
+      pull-requests: write
 
     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
 

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

@@ -4,7 +4,6 @@
   "license": "MIT",
   "author": "NullVoxPopuli",
   "scripts": {
-    "reroll-lockfile": "git rm -f '**/pnpm-lock.yaml'; pnpm i",
     "build": "pnpm run --filter ember-resources build",
     "build:docs": "pnpm run --filter docs docs:collect",
     "ci:update": "npx ember-ci-update",
@@ -13,15 +12,16 @@
     "dev:docs": "pnpm run --filter docs docs:watch --preserveWatchOutput",
     "dev:ember": "pnpm run --filter test-app start",
     "lint": "pnpm run --filter '*' lint",
-    "lint:fix": "pnpm run --filter '*' lint:fix"
+    "lint:fix": "pnpm run --filter '*' lint:fix",
+    "reroll-lockfile": "git rm -f '**/pnpm-lock.yaml'; pnpm i"
   },
   "devDependencies": {
     "@nullvoxpopuli/eslint-configs": "^3.2.0",
     "concurrently": "^8.0.0",
     "eslint": "^8.35.0",
     "loader.js": "^4.7.0",
     "prettier": "^3.1.1",
-    "release-plan": "^0.6.0",
+    "release-plan": "^0.9.0",
     "typescript": "^5.0.0"
   },
   "packageManager": "pnpm@8.14.1",
@@ -35,21 +35,20 @@
     "pnpm": "8.14.1"
   },
   "pnpm": {
-    "overrides": {
-      "@glimmer/manager": ">= 0.87.1",
-      "@glimmer/validator": ">= 0.87.1",
-      "release-plan": "github:embroider-build/release-plan#tmp-manypkg-dist",
-      "ember-eslint-parser": "0.2.5",
-      "eslint-plugin-ember": "github:ember-cli/eslint-plugin-ember#master"
-    },
     "peerDependencyRules": {
-      "ignoreMissing": [
-        "webpack"
-      ],
       "allowAny": [
         "ember-source",
         "typescript"
+      ],
+      "ignoreMissing": [
+        "webpack"
       ]
+    },
+    "overrides": {
+      "@glimmer/manager": ">= 0.87.1",
+      "@glimmer/validator": ">= 0.87.1",
+      "ember-eslint-parser": "0.2.5",
+      "eslint-plugin-ember": "github:ember-cli/eslint-plugin-ember#master"
     }
   }
 }