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

Expand current syntax to support aliases for latest version (current/latest/node) #483

Merged
merged 23 commits into from
May 12, 2022
Merged

Expand current syntax to support aliases for latest version (current/latest/node) #483

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b08c363
add node aliases
panticmilos Apr 19, 2022
db7606a
add test workflow dispatch
panticmilos Apr 19, 2022
7e4e7cc
fix test
panticmilos Apr 19, 2022
d421731
revert test changes
panticmilos Apr 19, 2022
983e751
add last line
panticmilos Apr 19, 2022
fdd5410
add unit tests
panticmilos Apr 27, 2022
e95e27a
revert functions exports
panticmilos Apr 27, 2022
eeff01b
Merge branch 'main' into v-mpantic/add-latest-alias
panticmilos Apr 27, 2022
dd0c4c2
update readme
panticmilos Apr 28, 2022
21115fb
Change e2e tests
panticmilos May 4, 2022
c94bad8
remove echo
panticmilos May 4, 2022
3aee215
update the documentation
panticmilos May 4, 2022
abfc09f
update the build
panticmilos May 4, 2022
9d28777
apply prettier
panticmilos May 4, 2022
66b5fd1
merge main
panticmilos May 4, 2022
9056cd3
update dist
panticmilos May 4, 2022
762cd63
Merge branch 'actions:main' into v-mpantic/add-latest-alias
panticmilos May 9, 2022
dd2d493
update e2e
panticmilos May 9, 2022
3a94d56
fix e2e
panticmilos May 9, 2022
07e689a
remove quotes on comparing string
panticmilos May 9, 2022
bd4ffc7
amend unit tests
panticmilos May 9, 2022
87c4bf1
build dist
panticmilos May 9, 2022
6e4956e
revert bumping dependecies
panticmilos May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
apply prettier
  • Loading branch information
@panticmilos
panticmilos committed May 4, 2022
commit 9d287779163e0be81bedb4f6e6a88d98c555b893
57 changes: 29 additions & 28 deletions __tests__/installer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,42 +911,43 @@ describe('setup-node', () => {
});

describe('latest alias syntax', () => {
it.each(['latest', 'current', 'node'])('download the %s version if alias is provided', async (inputVersion) => {
// Arrange
inputs['node-version'] = inputVersion;

os.platform = 'darwin';
os.arch = 'x64';
it.each(['latest', 'current', 'node'])(
'download the %s version if alias is provided',
async inputVersion => {
// Arrange
inputs['node-version'] = inputVersion;

const expectedVersion = nodeTestDist[0];
os.platform = 'darwin';
os.arch = 'x64';

let expectedUrl = `https://nodejs.org/dist/${expectedVersion.version}/node-${expectedVersion.version}-${os.platform}-${os.arch}.tar.gz`;
const expectedVersion = nodeTestDist[0];

findSpy.mockImplementation(() => '');
getManifestSpy.mockImplementation(() => {
throw new Error('Unable to download manifest');
});
let expectedUrl = `https://nodejs.org/dist/${expectedVersion.version}/node-${expectedVersion.version}-${os.platform}-${os.arch}.tar.gz`;

// Act
await main.run();
findSpy.mockImplementation(() => '');
getManifestSpy.mockImplementation(() => {
throw new Error('Unable to download manifest');
});

// Assert
expect(logSpy).toHaveBeenCalledWith(
`Attempting to download ${inputVersion}...`
);
// Act
await main.run();

expect(logSpy).toHaveBeenCalledWith(
'Unable to download manifest'
);
// Assert
expect(logSpy).toHaveBeenCalledWith(
`Attempting to download ${inputVersion}...`
);

expect(logSpy).toHaveBeenCalledWith(
'getting latest node version...'
);
expect(logSpy).toHaveBeenCalledWith('Unable to download manifest');

expect(logSpy).toHaveBeenCalledWith(
`Acquiring ${expectedVersion.version.substring(1, expectedVersion.version.length)} - ${os.arch} from ${expectedUrl}`
);
expect(logSpy).toHaveBeenCalledWith('getting latest node version...');

});
expect(logSpy).toHaveBeenCalledWith(
`Acquiring ${expectedVersion.version.substring(
1,
expectedVersion.version.length
)} - ${os.arch} from ${expectedUrl}`
);
}
);
});
});
6 changes: 5 additions & 1 deletion src/installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,11 @@ async function queryDistForMatch(
let versions: string[] = [];
let nodeVersions = await installer.getVersionsFromDist();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we omit the import statement above, we can omit that also:

Suggested change
let nodeVersions = await installer.getVersionsFromDist();
let nodeVersions = await getVersionsFromDist();


if (versionSpec === 'current' || versionSpec === 'latest' || versionSpec === 'node') {
if (
versionSpec === 'current' ||
versionSpec === 'latest' ||
versionSpec === 'node'
) {
core.info(`getting latest node version...`);
return nodeVersions[0].version;
}
Expand Down