Compare commits

...
21 Commits
Author SHA1 Message Date
Zoltan Kochan 187ace9a18 test: don't check pnpx 2022-02-10 01:18:35 +02:00
Zoltan Kochan 7f8a57faa8 test: update pnpm version 2022-02-10 01:16:10 +02:00
Zoltan Kochan 268b4179de Install the self-contained binary version of pnpm
This is a breaking change because the binary version of pnpm
is only available from v6.17.1

close #18
2022-02-10 01:13:09 +02:00
khai96_ 2270f39ef6 v2.1.0 2022-02-08 19:53:18 +07:00
khai96_ 394c848db6 Update the bundle 2022-02-08 19:50:57 +07:00
Khải e13928ccc5 Merge pull request #27 from metonym/fix-jobs-syntax
Specify job name to fix syntax error
2022-02-08 19:48:36 +07:00
Khải 93bd5a123d Merge pull request #29 from pnpm/pnpm-v7
The pnpm home directory should be added to PATH and PNPM_HOME
2022-02-08 19:47:28 +07:00
Zoltan Kochan 9eb14dd77c decrease bundle size 2022-02-08 14:44:50 +02:00
Zoltan Kochan eafb777c56 download script from pnpm.io 2022-02-08 00:39:20 +02:00
Zoltan Kochan e6378df420 PNPM_HOME_PATH=>PNPM_HOME 2022-02-08 00:21:53 +02:00
Zoltan Kochan 6ff6e97bc6 The pnpm home directory should be added to PATH and PNPM_HOME
This change is needed to make the action compatible with pnpm v7.

Related breaking change in pnpm: pnpm/pnpm#4280
2022-02-07 23:15:44 +02:00
Eric Liu 45d9c91ff6 Specify job name to fix syntax error 2022-01-29 08:17:29 -08:00
Khải 15569a497d Merge pull request #26 from ai/patch-1
Improve `version` docs
2021-12-16 21:20:06 +07:00
Andrey SitnikandKhải d70eebd14a Update README.md
Co-authored-by: Khải <[email protected]>
2021-12-16 17:18:46 +03:00
Andrey Sitnik 3bf8acf16f Improve version docs 2021-12-16 17:12:07 +03:00
Khải 3c2fe8c592 Merge pull request #21 from gaggle/patch-1
Spelling
2021-10-12 19:45:45 +07:00
Jon Lauridsen 76cc04cd5e Spelling 2021-10-12 13:34:10 +02:00
Khải bcad811784 Remove unused env from examples 2021-07-24 08:25:23 +07:00
Khải 602b36f177 Remove uses of undefined variables from examples 2021-07-24 08:22:22 +07:00
Khải 74a0fdc1a4 Merge pull request #14 from Jack-Works-forks/master
Update README: use lockfile hash instead of package.json hash
2021-06-01 09:44:13 +07:00
Jack Works 493e98ec5e Update README.md 2021-06-01 10:42:26 +08:00
7 changed files with 542 additions and 559 deletions

No files matched your search

+9 -9
View File
@@ -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
+34 -33
View File
@@ -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.
+1 -1
View File
@@ -1 +1 @@
module.exports=(()=>{var __webpack_modules__={2492:e=>{"use strict";e.exports=JSON.parse('{"anyOf":[{"$ref":"#/definitions/RunInstall"},{"type":"array","items":{"$ref":"#/definitions/RunInstall"}},{"type":["null","boolean"]}],"definitions":{"RunInstall":{"type":"object","properties":{"recursive":{"type":"boolean"},"cwd":{"type":"string"},"args":{"type":"array","items":{"type":"string"}}}}},"$schema":"http://json-schema.org/draft-07/schema#"}')},6011:function(e,n,r){"use strict";var f=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(n,"__esModule",{value:true});const s=r(6832);const l=f(r(8527));const c=f(r(3406));const i=f(r(9282));const v=f(r(6866));const p=f(r(2726));async function main(){const e=l.default();const n=s.getState("is_post");if(n==="true")return p.default(e);s.saveState("is_post","true");await i.default(e);console.log("Installation Completed!");c.default(e);v.default(e)}main().catch(e=>{console.error(e);s.setFailed(e)})},8527:function(e,n,r){"use strict";var f=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(n,"__esModule",{value:true});n.getInputs=void 0;const s=r(6832);const l=f(r(4010));const c=r(986);const i={required:true};const v=e=>l.default(s.getInput(e,i));const p=()=>({version:s.getInput("version",i),dest:v("dest"),runInstall:c.parseRunInstall("run_install")});n.getInputs=p;n.default=n.getInputs},986:function(e,n,r){"use strict";var f=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(n,"__esModule",{value:true});n.parseRunInstall=void 0;const s=f(r(1765));const l=r(9520);const c=f(r(8469));const i=r(6832);const v=f(r(2492));const p={required:true};function parseRunInstall(e){const n=l.load(i.getInput(e,p));const r=new c.default({allErrors:true});const f=r.compile(v.default);if(!f(n)){for(const e of f.errors){i.error(`with.run_install${e.dataPath}: ${e.message}`)}return s.default.exit(1)}if(!n)return[];if(n===true)return[{recursive:true}];if(Array.isArray(n))return n;return[n]}n.parseRunInstall=parseRunInstall},9282:function(e,n,r){"use strict";var f=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(n,"__esModule",{value:true});n.install=n.runSelfInstaller=void 0;const s=r(6832);const l=f(r(7388));n.runSelfInstaller=l.default;async function install(e){s.startGroup("Running self-installer...");const n=await l.default(e);s.endGroup();if(n){return s.setFailed(`Something does wrong, self-installer exits with code ${n}`)}}n.install=install;n.default=install},7388:function(e,n,r){"use strict";var f=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(n,"__esModule",{value:true});n.runSelfInstaller=void 0;const s=r(3129);const l=r(1765);const c=r(5622);const i=r(4240);const v=f(r(2192));async function runSelfInstaller(e){const{version:n,dest:r}=e;const f=n?`pnpm@${n}`:"pnpm";const p=c.join(r,"package.json");await i.remove(r);await i.ensureFile(p);await i.writeFile(p,JSON.stringify({private:true}));const d=s.spawn(l.execPath,["-","install",f,"--no-lockfile"],{cwd:r,stdio:["pipe","inherit","inherit"]});const a=await v.default("https://pnpm.js.org/pnpm.js");a.body.pipe(d.stdin);return new Promise((e,n)=>{d.on("error",n);d.on("close",e)})}n.runSelfInstaller=runSelfInstaller;n.default=runSelfInstaller},3406:(e,n,r)=>{"use strict";Object.defineProperty(n,"__esModule",{value:true});n.setOutputs=void 0;const f=r(6832);const s=r(1630);function setOutputs(e){const n=s.getBinDest(e);f.addPath(n);f.setOutput("dest",e.dest);f.setOutput("bin_dest",n)}n.setOutputs=setOutputs;n.default=setOutputs},6866:(e,n,r)=>{"use strict";Object.defineProperty(n,"__esModule",{value:true});n.runPnpmInstall=void 0;const f=r(3129);const s=r(6832);const l=r(1630);function runPnpmInstall(e){const n=l.patchPnpmEnv(e);for(const r of e.runInstall){const e=["install"];if(r.recursive)e.unshift("recursive");if(r.args)e.push(...r.args);const l=["pnpm",...e].join(" ");s.startGroup(`Running ${l}...`);const{error:c,status:i}=f.spawnSync("pnpm",e,{stdio:"inherit",cwd:r.cwd,shell:true,env:n});s.endGroup();if(c){s.setFailed(c);continue}if(i){s.setFailed(`Command ${l} (cwd: ${r.cwd}) exits with status ${i}`);continue}}}n.runPnpmInstall=runPnpmInstall;n.default=runPnpmInstall},2726:(e,n,r)=>{"use strict";Object.defineProperty(n,"__esModule",{value:true});n.pruneStore=void 0;const f=r(3129);const s=r(6832);const l=r(1630);function pruneStore(e){if(e.runInstall.length===0){console.log("Pruning is unnecessary.");return}s.startGroup("Running pnpm store prune...");const{error:n,status:r}=f.spawnSync("pnpm",["store","prune"],{stdio:"inherit",shell:true,env:l.patchPnpmEnv(e)});s.endGroup();if(n){s.warning(n);return}if(r){s.warning(`command pnpm store prune exits with code ${r}`);return}}n.pruneStore=pruneStore;n.default=pruneStore},1630:function(e,n,r){"use strict";var f=this&&this.__importDefault||fuLine truncated
module.exports=(()=>{var __webpack_modules__={2492:e=>{"use strict";e.exports=JSON.parse('{"anyOf":[{"$ref":"#/definitions/RunInstall"},{"type":"array","items":{"$ref":"#/definitions/RunInstall"}},{"type":["null","boolean"]}],"definitions":{"RunInstall":{"type":"object","properties":{"recursive":{"type":"boolean"},"cwd":{"type":"string"},"args":{"type":"array","items":{"type":"string"}}}}},"$schema":"http://json-schema.org/draft-07/schema#"}')},6152:function(e,p,d){"use strict";var a=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(p,"__esModule",{value:true});const n=d(6105);const l=a(d(539));const r=a(d(7701));const i=a(d(9875));const s=a(d(4882));const m=a(d(4424));async function main(){const e=(0,l.default)();const p=(0,n.getState)("is_post");if(p==="true")return(0,m.default)(e);(0,n.saveState)("is_post","true");await(0,i.default)(e);console.log("Installation Completed!");(0,r.default)(e);(0,s.default)(e)}main().catch(e=>{console.error(e);(0,n.setFailed)(e)})},539:function(e,p,d){"use strict";var a=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(p,"__esModule",{value:true});p.getInputs=void 0;const n=d(6105);const l=a(d(9413));const r=d(4019);const i={required:true};const s=e=>(0,l.default)((0,n.getInput)(e,i));const m=()=>({version:(0,n.getInput)("version",i),dest:s("dest"),runInstall:(0,r.parseRunInstall)("run_install")});p.getInputs=m;p.default=p.getInputs},4019:function(e,p,d){"use strict";var a=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(p,"__esModule",{value:true});p.parseRunInstall=void 0;const n=a(d(1765));const l=d(6070);const r=a(d(6562));const i=d(6105);const s=a(d(2492));const m={required:true};function parseRunInstall(e){const p=(0,l.load)((0,i.getInput)(e,m));const d=new r.default({allErrors:true});const a=d.compile(s.default);if(!a(p)){for(const e of a.errors){(0,i.error)(`with.run_install${e.dataPath}: ${e.message}`)}return n.default.exit(1)}if(!p)return[];if(p===true)return[{recursive:true}];if(Array.isArray(p))return p;return[p]}p.parseRunInstall=parseRunInstall},9875:function(e,p,d){"use strict";var a=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(p,"__esModule",{value:true});p.install=p.runSelfInstaller=void 0;const n=d(6105);const l=a(d(7529));p.runSelfInstaller=l.default;async function install(e){(0,n.startGroup)("Running self-installer...");const p=await(0,l.default)(e);(0,n.endGroup)();if(p){return(0,n.setFailed)(`Something went wrong, self-installer exits with code ${p}`)}}p.install=install;p.default=install},7529:function(e,p,d){"use strict";var a=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(p,"__esModule",{value:true});p.runSelfInstaller=void 0;const n=d(6105);const l=d(3129);const r=d(1765);const i=a(d(5622));const s=d(4982);const m=a(d(6015));async function runSelfInstaller(e){const{version:p,dest:d}=e;const a=p?`@pnpm/exe@${p}`:"@pnpm/exe";const f=i.default.join(d,"package.json");await(0,s.remove)(d);await(0,s.ensureFile)(f);await(0,s.writeFile)(f,JSON.stringify({private:true}));const v=(0,l.spawn)(r.execPath,["-","install",a,"--no-lockfile"],{cwd:d,stdio:["pipe","inherit","inherit"]});const c=await(0,m.default)("https://get.pnpm.io/v6.16.js");c.body.pipe(v.stdin);const o=await new Promise((e,p)=>{v.on("error",p);v.on("close",e)});if(o===0){const e=i.default.join(d,"node_modules/.bin");(0,n.addPath)(e);(0,n.exportVariable)("PNPM_HOME",e)}return o}p.runSelfInstaller=runSelfInstaller;p.default=runSelfInstaller},7701:(e,p,d)=>{"use strict";Object.defineProperty(p,"__esModule",{value:true});p.setOutputs=void 0;const a=d(6105);const n=d(6656);function setOutputs(e){const p=(0,n.getBinDest)(e);(0,a.addPath)(p);(0,a.setOutput)("dest",e.dest);(0,a.setOutput)("bin_dest",p)}p.setOutputs=setOutputs;p.default=setOutputs},4882:(e,p,d)=>{"use strict";Object.defineProperty(p,"__esModule",{value:true});p.runPnpmInstall=void 0;const a=d(3129);const n=d(6105);const l=d(6656);function runPnpmInstall(e){const p=(0,l.patchPnpmEnv)(e);for(const d of e.runInstall){const e=["install"];if(d.recursive)e.unshift("recursive");if(d.args)e.push(...d.args);const l=["pnpm",...e].join(" ");(0,n.startGroup)(`Running ${l}...`);const{error:r,status:i}=(0,a.spawnSync)("pnpm",e,{stdio:"inherit",cwd:d.cwd,shell:true,env:p});(0,n.endGroup)();if(r){(0,n.setFailed)(r);continue}if(i){(0,n.setFailed)(`Command ${l} (cwd: ${d.cwd}) exits with status ${i}`);continue}}}p.runPnpmInstall=runPnpmInstall;p.default=runPnpmInstall},4424:(e,p,d)=>{"use strict";Object.defineProperty(p,"__esModule",{value:true});p.pruneStore=void 0;const a=d(3129);const n=d(6105);const l=d(6656);function pruneStore(e){if(e.runInstall.length===0){console.log("Pruning is unnecessary.");return}(0,n.startGroup)("Running pnpm store prune...");const{error:p,status:d}=(0,a.spawnSync)("pnpm"Line truncated
+12 -12
View File
@@ -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"
}
}
+473 -498
View File
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -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}`)
}
}
+12 -5
View File
@@ -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