Skip to content

Commit

Permalink
Merge pull request #250 from nogic1008/refactor/boolean-input
Browse files Browse the repository at this point in the history
Use `core.getBooleanInput()` to resolve `include-prerelease` option
  • Loading branch information
marko-zivic-93 committed Aug 2, 2022
2 parents cb04ff8 + c2dac7f commit 37b00c4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions __tests__/setup-dotnet.test.ts
Expand Up @@ -16,6 +16,7 @@ describe('setup-dotnet tests', () => {
process.env.RUNNER_TOOL_CACHE = toolDir;
process.env.DOTNET_INSTALL_DIR = toolDir;
process.env.RUNNER_TEMP = tempDir;
process.env['INPUT_INCLUDE-PRERELEASE'] = 'false';
await io.rmRF(toolDir);
await io.rmRF(tempDir);
});
Expand Down
1 change: 1 addition & 0 deletions action.yml
Expand Up @@ -18,6 +18,7 @@ inputs:
include-prerelease:
description: 'Whether prerelease versions should be matched with non-exact versions (for example 5.0.0-preview.6 being matched by 5, 5.0, 5.x or 5.0.x). Defaults to false if not provided.'
required: False
default: 'false'
runs:
using: 'node16'
main: 'dist/index.js'
3 changes: 1 addition & 2 deletions dist/index.js
Expand Up @@ -478,8 +478,7 @@ function run() {
}
}
if (versions.length) {
const includePrerelease = (core.getInput('include-prerelease') || 'false').toLowerCase() ===
'true';
const includePrerelease = core.getBooleanInput('include-prerelease');
let dotnetInstaller;
for (const version of new Set(versions)) {
dotnetInstaller = new installer.DotnetCoreInstaller(version, includePrerelease);
Expand Down
6 changes: 3 additions & 3 deletions src/setup-dotnet.ts
Expand Up @@ -38,9 +38,9 @@ export async function run() {
}

if (versions.length) {
const includePrerelease: boolean =
(core.getInput('include-prerelease') || 'false').toLowerCase() ===
'true';
const includePrerelease: boolean = core.getBooleanInput(
'include-prerelease'
);
let dotnetInstaller!: installer.DotnetCoreInstaller;
for (const version of new Set<string>(versions)) {
dotnetInstaller = new installer.DotnetCoreInstaller(
Expand Down

0 comments on commit 37b00c4

Please sign in to comment.