From 8cb7ed29da79ff461ecbf4355829fa68d34b1b59 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Tue, 25 Jun 2024 10:35:59 -0400
Subject: [PATCH] Fix release-plan workflows due to
 https://github.com/embroider-build/create-release-plan-setup/issues/111

---
 .github/workflows/plan-release.yml | 15 ++++-----------
 .github/workflows/publish.yml      | 13 ++++---------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/plan-release.yml b/.github/workflows/plan-release.yml
index 72e122f..fb28987 100644
--- a/.github/workflows/plan-release.yml
+++ b/.github/workflows/plan-release.yml
@@ -50,22 +50,15 @@ jobs:
         with:
           fetch-depth: 0
           ref: 'master'
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-      
-      - uses: pnpm/action-setup@v3
-        with:
-          version: 8
-      - run: pnpm install --frozen-lockfile
-      
+      - uses: wyvox/action-setup-pnpm@v3
+
       - name: "Generate Explanation and Prep Changelogs"
         id: explanation
         run: |
           set +e
-          
+
           pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)
-          
+
 
           if [ $? -ne 0 ]; then
             echo 'text<<EOF' >> $GITHUB_OUTPUT
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e7fb1e5..2c1dd5e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -44,19 +44,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: wyvox/action-setup-pnpm@v3
         with:
-          node-version: 18
           # This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
-          registry-url: 'https://registry.npmjs.org'
-      
-      - uses: pnpm/action-setup@v3
-        with:
-          version: 8
-      - run: pnpm install --frozen-lockfile
+          node-registry-url: 'https://registry.npmjs.org'
+
       - name: npm publish
         run: pnpm release-plan publish
-      
+
         env:
           GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}