rename PNPM_HOME to PNPM_HOME_PATH

.github/workflows/test.yaml

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

README.md

@@ -54,13 +54,12 @@ on:
   - pull_request
 
 jobs:
-  install:
-    runs-on: ubuntu-latest
+  runs-on: ubuntu-latest
 
-    steps:
-      - uses: pnpm/action-setup@v2.1.0
-        with:
-          version: 6.0.2
+  steps:
+    - uses: pnpm/action-setup@v2.0.1
+      with:
+        version: 6.0.2
 ```
 
 ### Install pnpm and a few npm packages
@@ -71,19 +70,18 @@ on:
   - pull_request
 
 jobs:
-  install:
-    runs-on: ubuntu-latest
+  runs-on: ubuntu-latest
 
-    steps:
-      - uses: actions/checkout@v2
+  steps:
+    - uses: actions/checkout@v2
 
-      - 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]
+    - 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]
 ```
 
 ### Use cache to reduce installation time
@@ -94,25 +92,24 @@ on:
   - pull_request
 
 jobs:
-  cache-and-install:
-    runs-on: ubuntu-latest
+  runs-on: ubuntu-latest
 
-    steps:
-      build:
-        - uses: actions/checkout@v2
+  steps:
+    build:
+      - uses: actions/checkout@v2
 
-        - name: Cache pnpm modules
-          uses: actions/cache@v2
-          with:
-            path: ~/.pnpm-store
-            key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-            restore-keys: |
-              ${{ runner.os }}-
+      - 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.1.0
-          with:
-            version: 6.0.2
-            run_install: true
+      - uses: pnpm/action-setup@v2.0.1
+        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.

src/install-pnpm/run.ts

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