Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix node version file parsing #553

Merged
merged 6 commits into from Aug 4, 2022
Merged

Fix node version file parsing #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3890368
Fix node version file parsing
Aug 3, 2022
0db4699
Build index.js
Aug 3, 2022
e22d921
Non-json file error handling
Aug 3, 2022
7261564
Format code
Aug 3, 2022
14a17a7
Add package.json to e2e tests
Aug 3, 2022
18c26e1
Minor fix
Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/versions.yml
View file
Open in desktop
Expand Up @@ -92,7 +92,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version-file: [.nvmrc, .tool-versions]
node-version-file: [.nvmrc, .tool-versions, package.json]
steps:
- uses: actions/checkout@v3
- name: Setup node from node version file
Expand Down
2 changes: 1 addition & 1 deletion __tests__/data/package.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"engines": {
"node": ">=14.0.0"
"node": "^14.0.0"
}
}
15 changes: 10 additions & 5 deletions dist/setup/index.js
View file
Open in desktop
Expand Up @@ -71770,13 +71770,18 @@ function translateArchToDistUrl(arch) {
function parseNodeVersionFile(contents) {
var _a, _b;
let nodeVersion;
const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
nodeVersion = (_a = found === null || found === void 0 ? void 0 : found.groups) === null || _a === void 0 ? void 0 : _a.version;
// Try parsing the file as an NPM `package.json`
// file.
try {
nodeVersion = (_a = JSON.parse(contents).engines) === null || _a === void 0 ? void 0 : _a.node;
}
catch (_c) {
core.warning('Node version file is not JSON file');
}
if (!nodeVersion) {
try {
// Try parsing the file as an NPM `package.json`
// file.
nodeVersion = (_b = JSON.parse(contents).engines) === null || _b === void 0 ? void 0 : _b.node;
const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
nodeVersion = (_b = found === null || found === void 0 ? void 0 : found.groups) === null || _b === void 0 ? void 0 : _b.version;
if (!nodeVersion)
throw new Error();
}
Expand Down
14 changes: 9 additions & 5 deletions src/installer.ts
View file
Open in desktop
Expand Up @@ -497,14 +497,18 @@ function translateArchToDistUrl(arch: string): string {
export function parseNodeVersionFile(contents: string): string {
let nodeVersion: string | undefined;

const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
nodeVersion = found?.groups?.version;
// Try parsing the file as an NPM `package.json`
// file.
try {
nodeVersion = JSON.parse(contents).engines?.node;
} catch {
core.warning('Node version file is not JSON file');
}

if (!nodeVersion) {
try {
// Try parsing the file as an NPM `package.json`
// file.
nodeVersion = JSON.parse(contents).engines?.node;
const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
nodeVersion = found?.groups?.version;

if (!nodeVersion) throw new Error();
} catch (err) {
Expand Down