actions/setup-pnpm
2
0
Fork 0
mirror of https://github.com/pnpm/action-setup.git synced 2025-03-13 22:24:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixup! feat: add version_file_path option

Browse Source 
Added more logging
This commit is contained in:
Don Denton 2025-01-20 21:35:35 -05:00
parent c9ad2a3942
commit 05cbfb6f02
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/install-pnpm/run.ts
View File

@ -84,14 +84,22 @@ function getPnpmVersionFromFile(versionFilePath: string) {
// //
// And because we've reached here, we know the contents // And because we've reached here, we know the contents
// *are* JSON, so no further string parsing makes sense. // *are* JSON, so no further string parsing makes sense.
return throw new Error(`${versionFilePath} was supplied for 'version_file_path', but does not contain a pnpm version in a recognized property.`)
} }
} catch { } catch {
console.info('pnpm version file is not JSON file') console.info('pnpm version file is not JSON file, trying to parse as text')
} }
const found = contents.match(/^(?:pnpm\s+)?v?(?<version>[^\s]+)$/m) // If not JSON, try and grab a version from a few possible text formats.
return found?.groups?.version ?? contents.trim() const matched = contents.match(/^(?:pnpm\s+)?v?(?<version>[^\s]+)$/m)
const found = matched?.groups?.version ?? contents.trim()
// Check that the first character is at least a digit.
if (!/^d/.test(found[0])) {
throw new Error(`${versionFilePath} was supplied for 'version_file_path', but does not contain a pnpm version in a recognized format.`)
}
return found
} }
async function readTarget(opts: { async function readTarget(opts: {
@ -120,6 +128,7 @@ async function readTarget(opts: {
if (versionFilePath) { if (versionFilePath) {
version = getPnpmVersionFromFile(versionFilePath) version = getPnpmVersionFromFile(versionFilePath)
console.info(`Using pnpm version ${version} from ${versionFilePath}`)
} }
if (version) { if (version) {
@ -128,7 +137,9 @@ async function readTarget(opts: {
packageManager.replace('pnpm@', '') !== version packageManager.replace('pnpm@', '') !== version
) { ) {
throw new Error(`Multiple versions of pnpm specified: throw new Error(`Multiple versions of pnpm specified:
- version ${version} in the GitHub Action config with the key "version" - version ${version} ${versionFilePath
? `found in ${versionFilePath}, supplied as "version_file_path"`
: `in the GitHub Action config with the key "version"`}
- version ${packageManager} in the package.json with the key "packageManager" - version ${packageManager} in the package.json with the key "packageManager"
Remove one of these versions to avoid version mismatch errors like ERR_PNPM_BAD_PM_VERSION`) Remove one of these versions to avoid version mismatch errors like ERR_PNPM_BAD_PM_VERSION`)
} }