-
-
Notifications
You must be signed in to change notification settings - Fork 166
Throw error when multiple versions specified #122
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 1 commit
1ecf7e8
4504319
327b709
b036c0d
7ce3deb
dc94400
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,18 +41,32 @@ async function readTarget(opts: { | |
| readonly standalone: boolean | ||
| }) { | ||
| const { version, packageJsonFile, standalone } = opts | ||
| const { GITHUB_WORKSPACE } = process.env | ||
|
|
||
| if (version) return `${ standalone ? '@pnpm/exe' : 'pnpm' }@${version}` | ||
| let packageManager; | ||
|
|
||
| if (GITHUB_WORKSPACE) { | ||
| ({ packageManager } = JSON.parse(await readFile(path.join(GITHUB_WORKSPACE, packageJsonFile), 'utf8'))) | ||
| } | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If there is no
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hm, this error was also there before, wasn't it? Should that be a separate PR? Happy to wrap it in a
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Before, if user already specifies
If the file doesn't exist (
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
I added a condition to swallow the error if |
||
|
|
||
| if (version) { | ||
| if (typeof packageManager === 'string') { | ||
| throw new Error(`Multiple versions of pnpm specified: | ||
| - version ${version} in the GitHub Action config with the key "version" | ||
| - 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`) | ||
| } | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. but why should it fail if the versions match?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added a condition to skip if versions match: |
||
|
|
||
| return `${ standalone ? '@pnpm/exe' : 'pnpm' }@${version}` | ||
| } | ||
|
|
||
| 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, packageJsonFile), 'utf8')) | ||
| if (typeof packageManager !== 'string') { | ||
| throw new Error(`No pnpm version is specified. | ||
| Please specify it by one of the following ways: | ||
|
|
@@ -64,7 +78,7 @@ Please specify it by one of the following ways: | |
| throw new Error('Invalid packageManager field in package.json') | ||
| } | ||
|
|
||
| if(standalone){ | ||
| if (standalone){ | ||
KSXGitHub marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return packageManager.replace('pnpm@', '@pnpm/exe@') | ||
| } | ||
|
|
||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.