Merge pull request #534 from adopted-ember-addons/pnpm-8

Upgrade to pnpm-8
adopted-ember-addons · Dec 20, 2023 · 341f1cb · 341f1cb
2 parents ce7f0c1 + 6ac5ef3
commit 341f1cb
Show file tree

Hide file tree

Showing 4 changed files with 2,131 additions and 2,036 deletions.
diff --git a/.github/workflows/plan-release.yml b/.github/workflows/plan-release.yml
@@ -5,7 +5,7 @@ on:
       - main
       - master
   pull_request:
-    types: 
+    types:
       - labeled
 
 concurrency:
@@ -46,22 +46,15 @@ jobs:
         # lerna-changelog can discover what's changed since the last release
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8
-      - run: pnpm install --frozen-lockfile
-
+      - uses: wyvox/action-setup-pnpm@v3
+
       - name: "Generate Explanation and Prep Changelogs"
         id: explanation
         run: |
           set -x
-          
+
           pnpm release-plan prepare
-          
+
           echo 'text<<EOF' >> $GITHUB_OUTPUT
           jq .description .release-plan.json -r >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT
@@ -80,4 +73,4 @@ jobs:
 
             -----------------------------------------
 
-            ${{ steps.explanation.outputs.text }}
+            ${{ steps.explanation.outputs.text }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -41,19 +41,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@v2
-        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 }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/package.json b/package.json
@@ -15,9 +15,9 @@
   "devDependencies": {
     "release-plan": "^0.6.0"
   },
-  "packageManager": "pnpm@7.33.6",
+  "packageManager": "pnpm@8.12.1",
   "volta": {
     "node": "16.19.0",
-    "pnpm": "7.33.6"
+    "pnpm": "8.12.1"
   }
 }