Compare commits

..
5 Commits
Author SHA1 Message Date
Zoltan Kochan 0e9c99a89a rename PNPM_HOME to PNPM_HOME_PATH 2022-02-07 23:01:43 +02:00
Zoltan Kochan 9087a16275 rebundle 2022-02-07 22:54:57 +02:00
Zoltan Kochan 9c583927b0 fix: update deps 2022-02-07 22:49:02 +02:00
Zoltan Kochan 43a416008e fix: add PNPM_HOME env variable 2022-02-07 03:33:01 +02:00
Zoltan Kochan eb99e9e4c7 fix: add pnpm to PATH 2022-02-07 03:26:03 +02:00
4 changed files with 51 additions and 54 deletions

No files matched your search

+9 -9
View File
@@ -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
+30 -33
View File
@@ -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.
+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#"}')},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
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.__createBinding||(Object.create?function(e,p,d,a){if(a===undefined)a=d;Object.defineProperty(e,a,{enumerable:true,get:function(){return p[d]}})}:function(e,p,d,a){if(a===undefined)a=d;e[a]=p[d]});var n=this&&this.__setModuleDefault||(Object.create?function(e,p){Object.defineProperty(e,"default",{enumerable:true,value:p})}:function(e,p){e["default"]=p});var l=this&&this.__importStar||function(e){if(e&&e.__esModule)return e;var p={};if(e!=null)for(var d in e)if(d!=="default"&&Object.prototype.hasOwnProperty.call(e,d))a(p,e,d);n(p,e);return p};var r=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(p,"__esModule",{value:true});p.runSelfInstaller=void 0;const i=l(d(6105));const s=d(3129);const m=d(1765);const f=d(5622);const v=d(4982);const c=r(d(6015));async function runSelfInstaller(e){const{version:p,dest:d}=e;const a=p?`pnpm@${p}`:"pnpm";const n=(0,f.join)(d,"package.json");await(0,v.remove)(d);await(0,v.ensureFile)(n);await(0,v.writeFile)(n,JSON.stringify({private:true}));const l=(0,s.spawn)(m.execPath,["-","install",a,"--no-lockfile"],{cwd:d,stdio:["pipe","inherit","inherit"]});const r=await(0,c.default)("https://pnpm.js.org/pnpm.js");r.body.pipe(l.stdin);const o=await new Promise((e,p)=>{l.on("error",p);l.on("close",e)});if(o===0){const e=(0,f.join)(d,"node_modules/.bin");i.addPath(e);i.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}Line truncated
+11 -11
View File
@@ -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