fix: packageManager reader (#35)

* fix: packageManager reader

* chore: resolve review

* chore: run build
This commit is contained in:
Jack Works 2022-02-25 12:43:26 +08:00 committed by GitHub
parent 11ba3424e0
commit 35ab4267a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions

View File

@ -6,7 +6,6 @@ branding:
inputs: inputs:
version: version:
description: Version of PNPM to install description: Version of PNPM to install
required: true
dest: dest:
description: Where to store PNPM files description: Where to store PNPM files
required: false required: false

BIN
dist/index.js vendored

Binary file not shown.

View File

@ -8,13 +8,15 @@ import { Inputs } from '../inputs'
export async function runSelfInstaller(inputs: Inputs): Promise<number> { export async function runSelfInstaller(inputs: Inputs): Promise<number> {
const { version, dest } = inputs const { version, dest } = inputs
const pkgJson = path.join(dest, 'package.json')
const target = await readTarget(pkgJson, version)
// prepare self install
await remove(dest) await remove(dest)
const pkgJson = path.join(dest, 'package.json')
await ensureFile(pkgJson) await ensureFile(pkgJson)
await writeFile(pkgJson, JSON.stringify({ private: true })) await writeFile(pkgJson, JSON.stringify({ private: true }))
// prepare target pnpm
const target = await readTarget(version)
const cp = spawn(execPath, ['-', 'install', target, '--no-lockfile'], { const cp = spawn(execPath, ['-', 'install', target, '--no-lockfile'], {
cwd: dest, cwd: dest,
stdio: ['pipe', 'inherit', 'inherit'], stdio: ['pipe', 'inherit', 'inherit'],
@ -36,10 +38,18 @@ export async function runSelfInstaller(inputs: Inputs): Promise<number> {
return exitCode return exitCode
} }
async function readTarget(packageJsonPath: string, version?: string | undefined) { async function readTarget(version?: string | undefined) {
if (version) return `pnpm@${version}` if (version) return `pnpm@${version}`
const { packageManager } = JSON.parse(await readFile(packageJsonPath, 'utf8')) const { GITHUB_WORKSPACE } = process.env
if (!GITHUB_WORKSPACE) {
throw new Error(`No workspace is found.
If you're intended to let pnpm/action-setup read preferred pnpm version from the "packageManager" field in the package.json file,
please run the actions/checkout before pnpm/action-setup.
Otherwise, please specify the pnpm version in the action configuration.`)
}
const { packageManager } = JSON.parse(await readFile(path.join(GITHUB_WORKSPACE, 'package.json'), 'utf8'))
if (typeof packageManager !== 'string') { if (typeof packageManager !== 'string') {
throw new Error(`No pnpm version is specified. throw new Error(`No pnpm version is specified.
Please specify it by one of the following ways: Please specify it by one of the following ways: