From 484dbd8fd0e091f81938642999f630a7ebb06d43 Mon Sep 17 00:00:00 2001
From: Chris Manson <chris@manson.ie>
Date: Sat, 17 Feb 2024 23:38:22 +0000
Subject: [PATCH] remove wyvox/action-setup-pnpm to realign with ember-cli

---
 files/.github/workflows/ci.yml        | 39 ++++++++++++++++-----------
 files/.github/workflows/push-dist.yml | 14 +++++-----
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/files/.github/workflows/ci.yml b/files/.github/workflows/ci.yml
index 963d1bce..0467ef7d 100644
--- a/files/.github/workflows/ci.yml
+++ b/files/.github/workflows/ci.yml
@@ -17,13 +17,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: <%= pnpm ? 'wyvox/action-setup-pnpm@v3' : 'actions/setup-node@v3' %>
+      - uses: actions/checkout@v4<% if (pnpm) { %>
+      - uses: pnpm/action-setup@v3
         with:
-          node-version: 16<% if (!pnpm) { %>
-          cache: <%= yarn ? 'yarn' : 'npm' %>
+          version: 8<% } %>
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
-        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %><%}%>
+        run: <%= pnpm ? 'pnpm install --frozen-lockfile' : yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
       - name: Lint
         run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> lint
       - name: Run Tests
@@ -34,13 +37,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: <%= pnpm ? 'wyvox/action-setup-pnpm@v3' : 'actions/setup-node@v3' %>
+      - uses: actions/checkout@v4<% if (pnpm) { %>
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 8<% } %>
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16<% if (!pnpm) { %>
-          cache: <%= yarn ? 'yarn' : 'npm' %>
+          node-version: 18
+          cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
-        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %><%}%>
+        run: <%= pnpm ? 'pnpm install --no-lockfile' : yarn ? 'yarn install --no-lockfile' : 'npm install --no-package-lock' %>
       - name: Run Tests
         run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> test
 
@@ -62,13 +68,16 @@ jobs:
           - embroider-optimized
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: <%= pnpm ? 'wyvox/action-setup-pnpm@v3' : 'actions/setup-node@v3' %>
+      - uses: actions/checkout@v4<% if (pnpm) { %>
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 8<% } %>
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16<% if (!pnpm) { %>
-          cache: <%= yarn ? 'yarn' : 'npm' %>
+          node-version: 18
+          cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
-        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %><%}%>
+        run: <%= pnpm ? 'pnpm install --frozen-lockfile' : yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
       - name: Run Tests
         run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup
         working-directory: <%= testAppInfo.location %>
diff --git a/files/.github/workflows/push-dist.yml b/files/.github/workflows/push-dist.yml
index 4addfdb7..c2b044ad 100644
--- a/files/.github/workflows/push-dist.yml
+++ b/files/.github/workflows/push-dist.yml
@@ -16,14 +16,16 @@ jobs:
     name: Push dist
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3<% if (pnpm) {%>
-      - uses: wyvox/action-setup-pnpm@v3<%} else {%>
-      - name: Install Node
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4<% if (pnpm) { %>
+      - uses: pnpm/action-setup@v3
         with:
-          cache: '<%= yarn ? 'yarn' : 'npm' %>'<% } if (yarn || npm) { %>
+          version: 8<% } %>
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
-        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %><%}%>
+        run: <%= pnpm ? 'pnpm install --frozen-lockfile' : yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
       - uses: kategengler/put-built-npm-package-contents-on-branch@v2.0.0
         with:
           branch: dist