Merge pull request #10436 from ember-cli/standard-pnpm

stop using wyvox/action-setup-pnpm
ember-cli · Feb 8, 2024 · fa85990 · fa85990
2 parents 31cf87a + bfc3866
commit fa85990
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 25 deletions.
diff --git a/blueprints/addon/files/.github/workflows/ci.yml b/blueprints/addon/files/.github/workflows/ci.yml
@@ -19,16 +19,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3<% if (pnpm) { %>
-      - uses: wyvox/action-setup-pnpm@v2
+      - uses: pnpm/action-setup@v2
         with:
-          node-version: 18<% } else { %>
+          version: 8<% } %>
       - name: Install Node
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: <%= yarn ? 'yarn' : 'npm' %>
+          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
@@ -41,16 +41,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3<% if (pnpm) { %>
-      - uses: wyvox/action-setup-pnpm@v2
+      - uses: pnpm/action-setup@v2
         with:
-          node-version: 18
-          args: '--no-lockfile'<% } else { %>
+          version: 8<% } %>
       - uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: <%= yarn ? 'yarn' : 'npm' %>
+          cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
-        run: <%= yarn ? 'yarn install --no-lockfile' : 'npm install --no-shrinkwrap' %><% } %>
+        run: <%= pnpm ? 'pnpm install --no-lockfile' : yarn ? 'yarn install --no-lockfile' : 'npm install --no-shrinkwrap' %>
       - name: Run Tests
         run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> test:ember
 
@@ -74,15 +73,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3<% if (pnpm) { %>
-      - uses: wyvox/action-setup-pnpm@v2
+      - uses: pnpm/action-setup@v2
         with:
-          node-version: 18<% } else { %>
+          version: 8<% } %>
       - name: Install Node
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: <%= yarn ? 'yarn' : 'npm' %>
+          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 }}
diff --git a/blueprints/app/files/.github/workflows/ci.yml b/blueprints/app/files/.github/workflows/ci.yml
@@ -19,14 +19,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3<% if (pnpm) { %>
-      - uses: wyvox/action-setup-pnpm@v2<% } else { %>
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8<% } %>
       - name: Install Node
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: <%= yarn ? 'yarn' : 'npm' %>
+          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
 
@@ -37,13 +39,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3<% if (pnpm) { %>
-      - uses: wyvox/action-setup-pnpm@v2<% } else { %>
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8<% } %>
       - name: Install Node
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: <%= yarn ? 'yarn' : 'npm' %>
+          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: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %> test
diff --git a/tests/fixtures/addon/pnpm/.github/workflows/ci.yml b/tests/fixtures/addon/pnpm/.github/workflows/ci.yml
@@ -19,9 +19,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: wyvox/action-setup-pnpm@v2
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Install Node
+        uses: actions/setup-node@v3
         with:
           node-version: 18
+          cache: pnpm
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
       - name: Lint
         run: pnpm lint
       - name: Run Tests
@@ -34,10 +41,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: wyvox/action-setup-pnpm@v2
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - uses: actions/setup-node@v3
         with:
           node-version: 18
-          args: '--no-lockfile'
+          cache: pnpm
+      - name: Install Dependencies
+        run: pnpm install --no-lockfile
       - name: Run Tests
         run: pnpm test:ember
 
@@ -61,8 +73,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: wyvox/action-setup-pnpm@v2
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Install Node
+        uses: actions/setup-node@v3
         with:
           node-version: 18
+          cache: pnpm
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
       - name: Run Tests
         run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
diff --git a/tests/fixtures/app/pnpm/.github/workflows/ci.yml b/tests/fixtures/app/pnpm/.github/workflows/ci.yml
@@ -19,7 +19,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: wyvox/action-setup-pnpm@v2
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: pnpm
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
       - name: Lint
         run: pnpm lint
 
@@ -30,6 +39,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: wyvox/action-setup-pnpm@v2
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: pnpm
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
       - name: Run Tests
         run: pnpm test