From b1febf84ed0b7ac9c121fb745b7f025acad7418c Mon Sep 17 00:00:00 2001 From: khai96_ Date: Sat, 9 May 2020 21:41:25 +0700 Subject: [PATCH] Fix pruneStore --- dist/index.js | Bin 211744 -> 211932 bytes src/pnpm-install/index.ts | 8 ++------ src/pnpm-store-prune/index.ts | 3 +++ src/utils/index.ts | 8 ++++++++ 4 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 src/utils/index.ts diff --git a/dist/index.js b/dist/index.js index 357c0ba6c018e615dfb5755268bcc2b3e7bb0ee9..f63bb58fcde3aadbf6add6128e245f6f20ecf769 100644 GIT binary patch delta 5895 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 E9|}V4F8}}l delta 5775 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 diff --git a/src/pnpm-install/index.ts b/src/pnpm-install/index.ts index 5a09a0d..5ea479b 100644 --- a/src/pnpm-install/index.ts +++ b/src/pnpm-install/index.ts @@ -1,14 +1,10 @@ -import process from 'process' -import path from 'path' import { spawnSync } from 'child_process' import { setFailed } from '@actions/core' import { Inputs } from '../inputs' +import { patchPnpmEnv } from '../utils' export function runPnpmInstall(inputs: Inputs) { - const env = { - ...process.env, - PATH: inputs.binDest + path.delimiter + process.env.PATH - } + const env = patchPnpmEnv(inputs) for (const options of inputs.runInstall) { const args = ['install'] diff --git a/src/pnpm-store-prune/index.ts b/src/pnpm-store-prune/index.ts index cb45e2c..ef93bac 100644 --- a/src/pnpm-store-prune/index.ts +++ b/src/pnpm-store-prune/index.ts @@ -1,6 +1,7 @@ import { spawnSync } from 'child_process' import { setFailed } from '@actions/core' import { Inputs } from '../inputs' +import { patchPnpmEnv } from '../utils' export function pruneStore(inputs: Inputs) { if (inputs.runInstall.length === 0) { @@ -11,6 +12,8 @@ export function pruneStore(inputs: Inputs) { console.log('Running pnpm store prune') const { error, status } = spawnSync('pnpm', ['store', 'prune'], { stdio: 'inherit', + shell: true, + env: patchPnpmEnv(inputs) }) if (error) { diff --git a/src/utils/index.ts b/src/utils/index.ts new file mode 100644 index 0000000..c4fad7b --- /dev/null +++ b/src/utils/index.ts @@ -0,0 +1,8 @@ +import process from 'process' +import path from 'path' +import { Inputs } from '../inputs' + +export const patchPnpmEnv = (inputs: Inputs): NodeJS.ProcessEnv => ({ + ...process.env, + PATH: inputs.binDest + path.delimiter + process.env.PATH +})