v2.1.0

Specify job name to fix syntax error

README.md

@@ -1,16 +1,16 @@
-# Setup PNPM
+# Setup pnpm
 
-Install PNPM package manager.
+Install pnpm package manager.
 
 ## Inputs
 
 ### `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`
 
-**Optional** Where to store PNPM files.
+**Optional** Where to store pnpm files.
 
 ### `run_install`
 
@@ -46,7 +46,7 @@ Location of `pnpm` and `pnpx` command.
 
 ## Usage example
 
-### Just install PNPM
+### Just install pnpm
 
 ```yaml
 on:
@@ -54,15 +54,16 @@ on:
   - pull_request
 
 jobs:
+  install:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: pnpm/action-setup@v1.2.1
+      - uses: pnpm/action-setup@v2.1.0
         with:
-        version: 5.17.2
+          version: 6.0.2
 ```
 
-### Install PNPM and a few NPM packages
+### Install pnpm and a few npm packages
 
 ```yaml
 on:
@@ -70,14 +71,15 @@ on:
   - pull_request
 
 jobs:
+  install:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
 
-    - uses: pnpm/action-setup@v1.2.1
+      - uses: pnpm/action-setup@v2.1.0
         with:
-        version: 5.17.2
+          version: 6.0.2
           run_install: |
             - recursive: true
               args: [--frozen-lockfile, --strict-peer-dependencies]
@@ -92,6 +94,7 @@ on:
   - pull_request
 
 jobs:
+  cache-and-install:
     runs-on: ubuntu-latest
 
     steps:
@@ -100,17 +103,15 @@ jobs:
 
         - 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') }}
+            key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
             restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-
+              ${{ runner.os }}-
 
-      - uses: pnpm/action-setup@v1.2.1
+        - uses: pnpm/action-setup@v2.1.0
           with:
-          version: 5.17.2
+            version: 6.0.2
             run_install: true
 ```
 

package.json

@@ -7,21 +7,21 @@
     "start": "pnpm run build && sh ./run.sh"
   },
   "dependencies": {
-    "node-fetch": "^2.6.1",
+    "@actions/core": "^1.6.0",
-    "expand-tilde": "^2.0.2",
-    "js-yaml": "^4.0.0",
-    "ajv": "^6.12.5",
-    "fs-extra": "^9.1.0",
-    "@actions/core": "^1.2.6",
     "@types/expand-tilde": "^2.0.0",
-    "@types/node-fetch": "^2.5.8",
+    "@types/fs-extra": "^9.0.13",
-    "@types/js-yaml": "^4.0.0",
+    "@types/js-yaml": "^4.0.5",
-    "@types/fs-extra": "^9.0.8",
+    "@types/node": "^14.18.10",
-    "@types/node": "^14.14.35"
+    "@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,6 +1,7 @@
+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'
@@ -8,7 +9,7 @@ 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 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://pnpm.io/pnpm.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