-
-
Notifications
You must be signed in to change notification settings - Fork 91
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
Throw error when multiple versions specified #122
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1ecf7e8
Throw error when multiple versions specified
karlhorky 4504319
fix: fmt
KSXGitHub 327b709
fix: fmt
KSXGitHub b036c0d
Swallow error on ENOENT
karlhorky 7ce3deb
Match versions
karlhorky dc94400
refactor: install pnpm
zkochan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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'))) | ||
} | ||
|
||
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`) | ||
} | ||
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? 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) { | ||
return packageManager.replace('pnpm@', '@pnpm/exe@') | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If there is no
package.json
at root, this will result in error. Please fix this.There was a problem hiding this comment.
Choose a reason for hiding this comment
The 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
try/catch
to swallow the error if you think it belongs in this PRThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Before, if user already specifies
version
in the action, no error would actually happen.If the file doesn't exist (
error.code === 'ENOENT'
), assignundefined
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
packageManager
is already set toundefined
I added a condition to swallow the error if
error.code === 'ENOENT'
: