Try different ways

Update dist/index.js
Use console.log
2025-08-17 20:25:50 +08:00 · 2020-05-09 20:57:00 +07:00 · 2020-05-09 20:52:54 +07:00 · 2020-05-09 20:52:27 +07:00 · 2020-05-09 20:50:21 +07:00 · 2020-05-09 20:47:42 +07:00
22 changed files with 112 additions and 346 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: "/"
-    schedule:
-      interval: weekly
-    open-pull-requests-limit: 10
-    labels:
-    - dependabot
-    - github-actions
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -3,7 +3,6 @@ name: Test Action
 on:
  - push
  - pull_request
-  - workflow_dispatch

 jobs:
  test_default_inputs:
@@ -58,65 +57,11 @@ jobs:
        with:
          version: 4.11.1
          dest: ~/test/pnpm
+          bin_dest: ~/test/pnpm/.bin
+          registry: http://registry.yarnpkg.com/

      - name: 'Test: which'
        run: which pnpm && which pnpx

      - name: 'Test: install'
        run: pnpm install
-
-  test_run_install:
-    name: 'Test with run_install (${{ matrix.run_install.name }}, ${{ matrix.os }})'
-
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        pnpm:
-          - 4.11.1
-        os:
-          - ubuntu-latest
-          - macos-latest
-          - windows-latest
-        run_install:
-          - name: 'null'
-            value: 'null'
-          - name: 'empty object'
-            value: '{}'
-          - name: 'recursive'
-            value: |
-              recursive: true
-          - name: 'global'
-            value: |
-              args:
-                - --global
-                - --global-dir=./pnpm-global
-                - npm
-                - yarn
-                - pnpm
-          - name: 'array'
-            value: |
-              - {}
-              - recursive: true
-              - args:
-                - --global
-                - --global-dir=./pnpm-global
-                - npm
-                - yarn
-                - pnpm
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Run the action
-        uses: ./
-        with:
-          version: 4.11.1
-          run_install: ${{ matrix.run_install.value }}
-
-      - name: 'Test: which'
-        run: which pnpm; which pnpx
-
-      - name: 'Test: install'
-        run: pnpm install
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@ temp
 *.temp
 tmp.*
 temp.*
-.pnpm-store
--- a/README.md
+++ b/README.md
@@ -12,27 +12,17 @@ Install PNPM package manager.

 **Optional** Where to store PNPM files.

+### `bin_dest`
+
+**Optional** Where to store executables (`pnpm` and `pnpx` commands).
+
+### `registry`
+
+**Optional** Registry to download PNPM from.
+
 ### `run_install`

-**Optional** (_default:_ `null`) If specified, run `pnpm install`.
-
-If `run_install` is either `null` or `false`, pnpm will not install any npm package.
-
-If `run_install` is `true`, pnpm will install dependencies recursively.
-
-If `run_install` is a YAML string representation of either an object or an array, pnpm will execute every install commands.
-
-#### `run_install.recursive`
-
-**Optional** (_type:_ `boolean`, _default:_ `false`) Whether to use `pnpm recursive install`.
-
-#### `run_install.cwd`
-
-**Optional** (_type:_ `string`) Working directory when run `pnpm [recursive] install`.
-
-#### `run_install.args`
-
-**Optional** (_type:_ `string[]`) Additional arguments after `pnpm [recursive] install`, e.g. `[--frozen-lockfile, --strict-peer-dependencies]`.
+**Optional** If specified, run `pnpm install`.

 ## Outputs

@@ -42,28 +32,10 @@ Expanded path of inputs#dest.

 ### `bin_dest`

-Location of `pnpm` and `pnpx` command.
+Expanded path of inputs#bin_dest.

 ## Usage example

-### Just install PNPM
-
-```yaml
-on:
-  - push
-  - pull_request
-
-jobs:
-  runs-on: ubuntu-latest
-
-  steps:
-    - uses: pnpm/action-setup@v1.2.1
-      with:
-        version: 5.17.2
-```
-
-### Install PNPM and a few NPM packages
-
 ```yaml
 on:
  - push
@@ -75,47 +47,14 @@ jobs:
  steps:
    - uses: actions/checkout@v2

-    - uses: pnpm/action-setup@v1.2.1
+    - uses: pnpm/action-setup@v1.1.0
      with:
-        version: 5.17.2
-        run_install: |
-          - recursive: true
-            args: [--frozen-lockfile, --strict-peer-dependencies]
-          - args: [--global, gulp, prettier, typescript]
+        version: 4.11.1
+
+    - name: Install dependencies
+      run: pnpm install
 ```

-### Use cache to reduce installation time
-
-```yaml
-on:
-  - push
-  - pull_request
-
-jobs:
-  runs-on: ubuntu-latest
-
-  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 }}-
-
-      - uses: pnpm/action-setup@v1.2.1
-        with:
-          version: 5.17.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.
-
 ## Notes

 This action does not setup Node.js for you, use [actions/setup-node](https://github.com/actions/setup-node) yourself.
--- a/action.yml
+++ b/action.yml
@@ -11,6 +11,14 @@ inputs:
    description: Where to store PNPM files
    required: false
    default: ~/setup-pnpm
+  bin_dest:
+    description: Where to store executables (pnpm and pnpx commands)
+    required: false
+    default: ~/setup-pnpm/.bin
+  registry:
+    description: Registry to download PNPM from
+    required: false
+    default: https://registry.npmjs.com
  run_install:
    description: If specified, run `pnpm install`
    required: false
--- a/dist/index.js
+++ b/dist/index.js
--- a/package.json
+++ b/package.json
@@ -7,21 +7,19 @@
    "start": "pnpm run build && sh ./run.sh"
  },
  "dependencies": {
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.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",
+    "js-yaml": "^3.13.1",
+    "ajv": "^6.12.0",
+    "@actions/core": "^1.2.4",
    "@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/node-fetch": "^2.5.7",
+    "@types/js-yaml": "^3.12.3",
+    "@types/node": "^13.13.5"
  },
  "devDependencies": {
-    "typescript": "^4.2.3",
+    "typescript": "^3.8.3",
    "@ts-schema-autogen/cli": "^0.1.2",
-    "@vercel/ncc": "^0.27.0"
+    "@zeit/ncc": "^0.22.1"
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,25 +1,23 @@
 dependencies:
-  '@actions/core': 1.2.6
+  '@actions/core': 1.2.4
  '@types/expand-tilde': 2.0.0
-  '@types/fs-extra': 9.0.8
-  '@types/js-yaml': 4.0.0
-  '@types/node': 14.14.35
-  '@types/node-fetch': 2.5.8
-  ajv: 6.12.6
+  '@types/js-yaml': 3.12.3
+  '@types/node': 13.13.5
+  '@types/node-fetch': 2.5.7
+  ajv: 6.12.0
  expand-tilde: 2.0.2
-  fs-extra: 9.1.0
-  js-yaml: 4.0.0
-  node-fetch: 2.6.1
+  js-yaml: 3.13.1
+  node-fetch: 2.6.0
 devDependencies:
  '@ts-schema-autogen/cli': 0.1.2
-  '@vercel/ncc': 0.27.0
-  typescript: 4.2.3
-lockfileVersion: 5.2
+  '@zeit/ncc': 0.22.1
+  typescript: 3.8.3
+lockfileVersion: 5.1
 packages:
-  /@actions/core/1.2.6:
+  /@actions/core/1.2.4:
    dev: false
    resolution:
-      integrity: sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA==
+      integrity: sha512-YJCEq8BE3CdN8+7HPZ/4DxJjk/OkZV2FFIf+DlZTC/4iBlzYCD5yjRR6eiOS5llO11zbRltIRuKAjMKaWTE6cg==
  /@ts-schema-autogen/cli/0.1.2:
    dependencies:
      '@ts-schema-autogen/main': 0.1.1
@@ -177,39 +175,23 @@ packages:
    dev: true
    resolution:
      integrity: sha512-UoOfVEzAUpeSPmjm7h1uk5MH6KZma2z2O7a75onTGjnNvAvMVrPzPL/vBbT65iIGHWj6rokwfmYcmxmlSf2uwg==
-  /@types/fs-extra/9.0.8:
-    dependencies:
-      '@types/node': 14.14.35
-    dev: false
-    resolution:
-      integrity: sha512-bnlTVTwq03Na7DpWxFJ1dvnORob+Otb8xHyUqUWhqvz/Ksg8+JXPlR52oeMSZ37YEOa5PyccbgUNutiQdi13TA==
  /@types/js-yaml/3.12.3:
-    dev: true
    resolution:
      integrity: sha512-otRe77JNNWzoVGLKw8TCspKswRoQToys4tuL6XYVBFxjgeM0RUrx7m3jkaTdxILxeGry3zM8mGYkGXMeQ02guA==
-  /@types/js-yaml/4.0.0:
-    dev: false
-    resolution:
-      integrity: sha512-4vlpCM5KPCL5CfGmTbpjwVKbISRYhduEJvvUWsH5EB7QInhEj94XPZ3ts/9FPiLZFqYO0xoW4ZL8z2AabTGgJA==
  /@types/json-schema/7.0.4:
    dev: true
    resolution:
      integrity: sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
-  /@types/node-fetch/2.5.8:
+  /@types/node-fetch/2.5.7:
    dependencies:
-      '@types/node': 14.14.35
+      '@types/node': 13.13.5
      form-data: 3.0.0
    dev: false
    resolution:
-      integrity: sha512-fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==
+      integrity: sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
  /@types/node/13.13.5:
-    dev: true
    resolution:
      integrity: sha512-3ySmiBYJPqgjiHA7oEaIo2Rzz0HrOZ7yrNO5HWyaE5q0lQ3BppDZ3N53Miz8bw2I7gh1/zir2MGVZBvpb1zq9g==
-  /@types/node/14.14.35:
-    dev: false
-    resolution:
-      integrity: sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==
  /@types/yargs-parser/15.0.0:
    dev: true
    resolution:
@@ -220,29 +202,19 @@ packages:
    dev: true
    resolution:
      integrity: sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==
-  /@vercel/ncc/0.27.0:
+  /@zeit/ncc/0.22.1:
    dev: true
    hasBin: true
    resolution:
-      integrity: sha512-DllIJQapnU2YwewIhh/4dYesmMQw3h2cFtabECc/zSJHqUbNa0eJuEkRa6DXbZvh1YPWBtYQoPV17NlDpBw1Vw==
+      integrity: sha512-Qq3bMuonkcnV/96jhy9SQYdh39NXHxNMJ1O31ZFzWG9n52fR2DLtgrNzhj/ahlEjnBziMLGVWDbaS9sf03/fEw==
  /ajv/6.12.0:
    dependencies:
      fast-deep-equal: 3.1.1
      fast-json-stable-stringify: 2.1.0
      json-schema-traverse: 0.4.1
      uri-js: 4.2.2
-    dev: true
    resolution:
      integrity: sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
-  /ajv/6.12.6:
-    dependencies:
-      fast-deep-equal: 3.1.1
-      fast-json-stable-stringify: 2.1.0
-      json-schema-traverse: 0.4.1
-      uri-js: 4.2.2
-    dev: false
-    resolution:
-      integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
  /ansi-regex/4.1.0:
    dev: true
    engines:
@@ -275,23 +247,12 @@ packages:
  /argparse/1.0.10:
    dependencies:
      sprintf-js: 1.0.3
-    dev: true
    resolution:
      integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  /argparse/2.0.1:
-    dev: false
-    resolution:
-      integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
  /asynckit/0.4.0:
    dev: false
    resolution:
      integrity: sha1-x57Zf380y48robyXkLzDZkdLS3k=
-  /at-least-node/1.0.0:
-    dev: false
-    engines:
-      node: '>= 4.0.0'
-    resolution:
-      integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
  /balanced-match/1.0.0:
    dev: true
    resolution:
@@ -387,7 +348,6 @@ packages:
    resolution:
      integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
  /esprima/4.0.1:
-    dev: true
    engines:
      node: '>=4'
    hasBin: true
@@ -458,17 +418,6 @@ packages:
      node: '>=6 <7 || >=8'
    resolution:
      integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  /fs-extra/9.1.0:
-    dependencies:
-      at-least-node: 1.0.0
-      graceful-fs: 4.2.3
-      jsonfile: 6.1.0
-      universalify: 2.0.0
-    dev: false
-    engines:
-      node: '>=10'
-    resolution:
-      integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
  /fs.realpath/1.0.0:
    dev: true
    resolution:
@@ -491,6 +440,7 @@ packages:
    resolution:
      integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
  /graceful-fs/4.2.3:
+    dev: true
    resolution:
      integrity: sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
  /homedir-polyfill/1.0.3:
@@ -528,17 +478,9 @@ packages:
    dependencies:
      argparse: 1.0.10
      esprima: 4.0.1
-    dev: true
    hasBin: true
    resolution:
      integrity: sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  /js-yaml/4.0.0:
-    dependencies:
-      argparse: 2.0.1
-    dev: false
-    hasBin: true
-    resolution:
-      integrity: sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
  /json-schema-traverse/0.4.1:
    resolution:
      integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
@@ -554,14 +496,6 @@ packages:
      graceful-fs: 4.2.3
    resolution:
      integrity: sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  /jsonfile/6.1.0:
-    dependencies:
-      universalify: 2.0.0
-    dev: false
-    optionalDependencies:
-      graceful-fs: 4.2.3
-    resolution:
-      integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
  /jsonify/0.0.0:
    dev: true
    resolution:
@@ -603,12 +537,12 @@ packages:
    dev: true
    resolution:
      integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  /node-fetch/2.6.1:
+  /node-fetch/2.6.0:
    dev: false
    engines:
      node: 4.x || >=6.0.0
    resolution:
-      integrity: sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+      integrity: sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
  /once/1.4.0:
    dependencies:
      wrappy: 1.0.2
@@ -689,7 +623,6 @@ packages:
    resolution:
      integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
  /sprintf-js/1.0.3:
-    dev: true
    resolution:
      integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
  /string-width/3.1.0:
@@ -750,25 +683,12 @@ packages:
    hasBin: true
    resolution:
      integrity: sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
-  /typescript/4.2.3:
-    dev: true
-    engines:
-      node: '>=4.2.0'
-    hasBin: true
-    resolution:
-      integrity: sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
  /universalify/0.1.2:
    dev: true
    engines:
      node: '>= 4.0.0'
    resolution:
      integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-  /universalify/2.0.0:
-    dev: false
-    engines:
-      node: '>= 10.0.0'
-    resolution:
-      integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
  /uri-js/4.2.2:
    dependencies:
      punycode: 2.1.1
@@ -863,17 +783,15 @@ packages:
    resolution:
      integrity: sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
 specifiers:
-  '@actions/core': ^1.2.6
+  '@actions/core': ^1.2.4
  '@ts-schema-autogen/cli': ^0.1.2
  '@types/expand-tilde': ^2.0.0
-  '@types/fs-extra': ^9.0.8
-  '@types/js-yaml': ^4.0.0
-  '@types/node': ^14.14.35
-  '@types/node-fetch': ^2.5.8
-  '@vercel/ncc': ^0.27.0
-  ajv: ^6.12.5
+  '@types/js-yaml': ^3.12.3
+  '@types/node': ^13.13.5
+  '@types/node-fetch': ^2.5.7
+  '@zeit/ncc': ^0.22.1
+  ajv: ^6.12.0
  expand-tilde: ^2.0.2
-  fs-extra: ^9.1.0
-  js-yaml: ^4.0.0
-  node-fetch: ^2.6.1
-  typescript: ^4.2.3
+  js-yaml: ^3.13.1
+  node-fetch: ^2.6.0
+  typescript: ^3.8.3
--- a/renovate.json
+++ b/renovate.json
@@ -1,10 +1,6 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
  "pinVersions": false,
  "extends": [
    "config:base"
-  ],
-  "ignoreDeps": [
-    "ajv"
  ]
 }
--- a/run.sh
+++ b/run.sh
@@ -3,5 +3,7 @@
 export HOME="$(pwd)"
 export INPUT_VERSION=4.11.1
 export INPUT_DEST='~/pnpm.temp'
+export INPUT_BIN_DEST='~/pnpm.temp/.bin'
+export INPUT_REGISTRY=https://registry.npmjs.com
 export INPUT_RUN_INSTALL=null
 exec node dist/index.js
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,15 +1,20 @@
-import { setFailed, saveState, getState } from '@actions/core'
+import { setFailed, getState } from '@actions/core'
 import getInputs from './inputs'
 import setOutputs from './outputs'
 import installPnpm from './install-pnpm'
 import pnpmInstall from './pnpm-install'
-import pruneStore from './pnpm-store-prune'

 async function main() {
+  const isPost = getState('isPost')
+  console.log({
+    is_post: getState('is_post'),
+    isPost: getState('isPost'),
+    STATE_isPost: process.env['STATE_isPost'],
+  })
+  if (isPost) {
+    return
+  }
  const inputs = getInputs()
-  const isPost = getState('is_post')
-  if (isPost === 'true') return pruneStore(inputs)
-  saveState('is_post', 'true')
  await installPnpm(inputs)
  console.log('Installation Completed!')
  setOutputs(inputs)
--- a/src/inputs/index.ts
+++ b/src/inputs/index.ts
@@ -5,6 +5,8 @@ import { RunInstall, parseRunInstall } from './run-install'
 export interface Inputs {
  readonly version: string
  readonly dest: string
+  readonly binDest: string
+  readonly registry: string
  readonly runInstall: RunInstall[]
 }

@@ -17,6 +19,8 @@ const parseInputPath = (name: string) => expandTilde(getInput(name, options))
 export const getInputs = (): Inputs => ({
  version: getInput('version', options),
  dest: parseInputPath('dest'),
+  binDest: parseInputPath('bin_dest'),
+  registry: getInput('registry', options),
  runInstall: parseRunInstall('run_install'),
 })

--- a/src/inputs/run-install.ts
+++ b/src/inputs/run-install.ts
@@ -1,5 +1,5 @@
 import process from 'process'
-import { load } from 'js-yaml'
+import { safeLoad } from 'js-yaml'
 import Ajv from 'ajv'
 import { getInput, error, InputOptions } from '@actions/core'
 import runInstallSchema from './run-install-input.schema.json'
@@ -21,9 +21,10 @@ const options: InputOptions = {
 }

 export function parseRunInstall(name: string): RunInstall[] {
-  const result: RunInstallInput = load(getInput(name, options)) as any
+  const result: RunInstallInput = safeLoad(getInput(name, options))
  const ajv = new Ajv({
    allErrors: true,
+    async: false,
  })
  const validate = ajv.compile(runInstallSchema)
  if (!validate(result)) {
--- a/src/install-pnpm/index.ts
+++ b/src/install-pnpm/index.ts
@@ -1,13 +1,11 @@
-import { setFailed, startGroup, endGroup } from '@actions/core'
+import { setFailed } from '@actions/core'
 import { Inputs } from '../inputs'
 import runSelfInstaller from './run'

 export { runSelfInstaller }

 export async function install(inputs: Inputs) {
-  startGroup('Running self-installer...')
  const status = await runSelfInstaller(inputs)
-  endGroup()
  if (status) {
    return setFailed(`Something does wrong, self-installer exits with code ${status}`)
  }
--- a/src/install-pnpm/run.ts
+++ b/src/install-pnpm/run.ts
@@ -1,25 +1,20 @@
 import { spawn } from 'child_process'
 import { execPath } from 'process'
-import { join } from 'path'
-import { remove, ensureFile, writeFile } from 'fs-extra'
-import fetch from 'node-fetch'
+import { downloadSelfInstaller } from '../self-installer'
 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')
-
-  await remove(dest)
-  await ensureFile(pkgJson)
-  await writeFile(pkgJson, JSON.stringify({ private: true }))
-
-  const cp = spawn(execPath, ['-', 'install', target, '--no-lockfile'], {
-    cwd: dest,
+  const cp = spawn(execPath, {
+    env: {
+      PNPM_VERSION: inputs.version,
+      PNPM_DEST: inputs.dest,
+      PNPM_BIN_DEST: inputs.binDest,
+      PNPM_REGISTRY: inputs.registry,
+    },
    stdio: ['pipe', 'inherit', 'inherit'],
  })

-  const response = await fetch('https://pnpm.js.org/pnpm.js')
+  const response = await downloadSelfInstaller()
  response.body.pipe(cp.stdin)

  return new Promise((resolve, reject) => {
--- a/src/outputs/index.ts
+++ b/src/outputs/index.ts
@@ -1,12 +1,10 @@
 import { setOutput, addPath } from '@actions/core'
 import { Inputs } from '../inputs'
-import { getBinDest } from '../utils'

 export function setOutputs(inputs: Inputs) {
-  const binDest = getBinDest(inputs)
-  addPath(binDest)
+  addPath(inputs.binDest)
  setOutput('dest', inputs.dest)
-  setOutput('bin_dest', binDest)
+  setOutput('bin_dest', inputs.binDest)
 }

 export default setOutputs
--- a/src/pnpm-install/index.ts
+++ b/src/pnpm-install/index.ts
@@ -1,10 +1,14 @@
+import process from 'process'
+import path from 'path'
 import { spawnSync } from 'child_process'
-import { setFailed, startGroup, endGroup } from '@actions/core'
+import { setFailed } from '@actions/core'
 import { Inputs } from '../inputs'
-import { patchPnpmEnv } from '../utils'

 export function runPnpmInstall(inputs: Inputs) {
-  const env = patchPnpmEnv(inputs)
+  const env = {
+    ...process.env,
+    PATH: inputs.binDest + path.delimiter + process.env.PATH
+  }

  for (const options of inputs.runInstall) {
    const args = ['install']
@@ -12,7 +16,7 @@ export function runPnpmInstall(inputs: Inputs) {
    if (options.args) args.push(...options.args)

    const cmdStr = ['pnpm', ...args].join(' ')
-    startGroup(`Running ${cmdStr}...`)
+    console.log('Running', cmdStr)

    const { error, status } = spawnSync('pnpm', args, {
      stdio: 'inherit',
@@ -21,8 +25,6 @@ export function runPnpmInstall(inputs: Inputs) {
      env,
    })

-    endGroup()
-
    if (error) {
      setFailed(error)
      continue
--- a/src/pnpm-store-prune/index.ts
+++ b/src/pnpm-store-prune/index.ts
@@ -1,31 +0,0 @@
-import { spawnSync } from 'child_process'
-import { warning, startGroup, endGroup } from '@actions/core'
-import { Inputs } from '../inputs'
-import { patchPnpmEnv } from '../utils'
-
-export function pruneStore(inputs: Inputs) {
-  if (inputs.runInstall.length === 0) {
-    console.log('Pruning is unnecessary.')
-    return
-  }
-
-  startGroup('Running pnpm store prune...')
-  const { error, status } = spawnSync('pnpm', ['store', 'prune'], {
-    stdio: 'inherit',
-    shell: true,
-    env: patchPnpmEnv(inputs)
-  })
-  endGroup()
-
-  if (error) {
-    warning(error)
-    return
-  }
-
-  if (status) {
-    warning(`command pnpm store prune exits with code ${status}`)
-    return
-  }
-}
-
-export default pruneStore
--- a/src/self-installer/download.ts
+++ b/src/self-installer/download.ts
@@ -0,0 +1,4 @@
+import fetch from 'node-fetch'
+import url from './url'
+export const downloadSelfInstaller = () => fetch(url)
+export default downloadSelfInstaller
--- a/src/self-installer/index.ts
+++ b/src/self-installer/index.ts
@@ -0,0 +1,2 @@
+export * from './url'
+export * from './download'
--- a/src/self-installer/url.ts
+++ b/src/self-installer/url.ts
@@ -0,0 +1,3 @@
+export const ref = '301414cec74a2b6b63c95b42f2ad1790ccb980ed'
+export const url = `https://raw.githubusercontent.com/pnpm/self-installer/${ref}/install.js`
+export default url
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,10 +0,0 @@
-import process from 'process'
-import path from 'path'
-import { Inputs } from '../inputs'
-
-export const getBinDest = (inputs: Inputs): string => path.join(inputs.dest, 'node_modules', '.bin')
-
-export const patchPnpmEnv = (inputs: Inputs): NodeJS.ProcessEnv => ({
-  ...process.env,
-  PATH: getBinDest(inputs) + path.delimiter + process.env.PATH
-})
Author	SHA1	Message	Date
khai96_	271a9df5fb	Try different ways	2020-05-09 20:57:00 +07:00
khai96_	3b5e8836ec	Update dist/index.js	2020-05-09 20:52:54 +07:00
khai96_	0fa2b7d3a5	Use console.log	2020-05-09 20:52:27 +07:00
khai96_	c3e0d9f20f	Update dist/index.js	2020-05-09 20:50:21 +07:00
khai96_	d2316507fd	Inspect isPost	2020-05-09 20:47:42 +07:00