test: don't check pnpx

This is a breaking change because the binary version of pnpm
is only available from v6.17.1

close #18

.github/workflows/test.yaml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         pnpm:
-          - 4.11.1
+          - 6.17.1
         os:
           - ubuntu-latest
           - macos-latest
@@ -27,10 +27,10 @@ jobs:
       - name: Run the action
         uses: ./
         with:
-          version: 4.11.1
+          version: 6.17.1
 
       - name: 'Test: which'
-        run: which pnpm; which pnpx
+        run: which pnpm
 
       - name: 'Test: install'
         run: pnpm install
@@ -44,7 +44,7 @@ jobs:
       fail-fast: false
       matrix:
         pnpm:
-          - 4.11.1
+          - 6.17.1
         os:
           - ubuntu-latest
           - macos-latest
@@ -56,11 +56,11 @@ jobs:
       - name: Run the action
         uses: ./
         with:
-          version: 4.11.1
+          version: 6.17.1
           dest: ~/test/pnpm
 
       - name: 'Test: which'
-        run: which pnpm && which pnpx
+        run: which pnpm
 
       - name: 'Test: install'
         run: pnpm install
@@ -74,7 +74,7 @@ jobs:
       fail-fast: false
       matrix:
         pnpm:
-          - 4.11.1
+          - 6.17.1
         os:
           - ubuntu-latest
           - macos-latest
@@ -112,11 +112,11 @@ jobs:
       - name: Run the action
         uses: ./
         with:
-          version: 4.11.1
+          version: 6.17.1
           run_install: ${{ matrix.run_install.value }}
 
       - name: 'Test: which'
-        run: which pnpm; which pnpx
+        run: which pnpm
 
       - name: 'Test: install'
         run: pnpm install

README.md

@@ -6,7 +6,7 @@ Install pnpm package manager.
 
 ### `version`
 
-**Required** Version of pnpm to install.
+**Required** Version of pnpm to install. It supports npm versioning scheme, it could be an exact version (such as `6.24.1`), or a version range (such as `6`, `6.x.x`, `6.24.x`, `^6.24.1`, `*`, etc.), or `latest`.
 
 ### `dest`
 
@@ -54,12 +54,13 @@ on:
   - pull_request
 
 jobs:
-  runs-on: ubuntu-latest
+  install:
+    runs-on: ubuntu-latest
 
-  steps:
-    - uses: pnpm/action-setup@v2.0.1
-      with:
-        version: 6.0.2
+    steps:
+      - uses: pnpm/action-setup@v2.1.0
+        with:
+          version: 6.0.2
 ```
 
 ### Install pnpm and a few npm packages
@@ -70,18 +71,19 @@ on:
   - pull_request
 
 jobs:
-  runs-on: ubuntu-latest
+  install:
+    runs-on: ubuntu-latest
 
-  steps:
-    - uses: actions/checkout@v2
+    steps:
+      - uses: actions/checkout@v2
 
-    - uses: pnpm/action-setup@v2.0.1
-      with:
-        version: 6.0.2
-        run_install: |
-          - recursive: true
-            args: [--frozen-lockfile, --strict-peer-dependencies]
-          - args: [--global, gulp, prettier, typescript]
+      - uses: pnpm/action-setup@v2.1.0
+        with:
+          version: 6.0.2
+          run_install: |
+            - recursive: true
+              args: [--frozen-lockfile, --strict-peer-dependencies]
+            - args: [--global, gulp, prettier, typescript]
 ```
 
 ### Use cache to reduce installation time
@@ -92,26 +94,25 @@ on:
   - pull_request
 
 jobs:
-  runs-on: ubuntu-latest
+  cache-and-install:
+    runs-on: ubuntu-latest
 
-  steps:
-    build:
-      - uses: actions/checkout@v2
+    steps:
+      build:
+        - uses: actions/checkout@v2
 
-      - name: Cache pnpm modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-pnpm-modules
-        with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-
+        - name: Cache pnpm modules
+          uses: actions/cache@v2
+          with:
+            path: ~/.pnpm-store
+            key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+            restore-keys: |
+              ${{ runner.os }}-
 
-      - uses: pnpm/action-setup@v2.0.1
-        with:
-          version: 6.0.2
-          run_install: true
+        - uses: pnpm/action-setup@v2.1.0
+          with:
+            version: 6.0.2
+            run_install: true
 ```
 
 **Note:** You don't need to run `pnpm store prune` at the end; post-action has already taken care of that.

package.json

@@ -7,21 +7,21 @@
     "start": "pnpm run build && sh ./run.sh"
   },
   "dependencies": {
-    "node-fetch": "^2.6.1",
-    "expand-tilde": "^2.0.2",
-    "js-yaml": "^4.0.0",
-    "ajv": "^6.12.5",
-    "fs-extra": "^9.1.0",
-    "@actions/core": "^1.2.6",
+    "@actions/core": "^1.6.0",
     "@types/expand-tilde": "^2.0.0",
-    "@types/node-fetch": "^2.5.8",
-    "@types/js-yaml": "^4.0.0",
-    "@types/fs-extra": "^9.0.8",
-    "@types/node": "^14.14.35"
+    "@types/fs-extra": "^9.0.13",
+    "@types/js-yaml": "^4.0.5",
+    "@types/node": "^14.18.10",
+    "@types/node-fetch": "^2.5.12",
+    "ajv": "^6.12.6",
+    "expand-tilde": "^2.0.2",
+    "fs-extra": "^9.1.0",
+    "js-yaml": "^4.1.0",
+    "node-fetch": "^2.6.7"
   },
   "devDependencies": {
-    "typescript": "^4.2.3",
     "@ts-schema-autogen/cli": "^0.1.2",
-    "@vercel/ncc": "^0.27.0"
+    "@vercel/ncc": "^0.27.0",
+    "typescript": "^4.5.5"
   }
 }

src/install-pnpm/index.ts

@@ -9,7 +9,7 @@ export async function install(inputs: Inputs) {
   const status = await runSelfInstaller(inputs)
   endGroup()
   if (status) {
-    return setFailed(`Something does wrong, self-installer exits with code ${status}`)
+    return setFailed(`Something went wrong, self-installer exits with code ${status}`)
   }
 }
 

src/install-pnpm/run.ts

@@ -1,14 +1,15 @@
+import { addPath, exportVariable } from '@actions/core'
 import { spawn } from 'child_process'
 import { execPath } from 'process'
-import { join } from 'path'
+import path from 'path'
 import { remove, ensureFile, writeFile } from 'fs-extra'
 import fetch from 'node-fetch'
 import { Inputs } from '../inputs'
 
 export async function runSelfInstaller(inputs: Inputs): Promise<number> {
   const { version, dest } = inputs
-  const target = version ? `pnpm@${version}` : 'pnpm'
-  const pkgJson = join(dest, 'package.json')
+  const target = version ? `@pnpm/exe@${version}` : '@pnpm/exe'
+  const pkgJson = path.join(dest, 'package.json')
 
   await remove(dest)
   await ensureFile(pkgJson)
@@ -19,13 +20,19 @@ export async function runSelfInstaller(inputs: Inputs): Promise<number> {
     stdio: ['pipe', 'inherit', 'inherit'],
   })
 
-  const response = await fetch('https://pnpm.js.org/pnpm.js')
+  const response = await fetch('https://get.pnpm.io/v6.16.js')
   response.body.pipe(cp.stdin)
 
-  return new Promise((resolve, reject) => {
+  const exitCode = await new Promise<number>((resolve, reject) => {
     cp.on('error', reject)
     cp.on('close', resolve)
   })
+  if (exitCode === 0) {
+    const pnpmHome = path.join(dest, 'node_modules/.bin')
+    addPath(pnpmHome)
+    exportVariable('PNPM_HOME', pnpmHome)
+  }
+  return exitCode
 }
 
 export default runSelfInstaller