Skip to content

Commit 18a5143

Browse files
committed
fix: make sure the tool has a default version before using it
1 parent 775ff23 commit 18a5143

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

dist/node12/setup-cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node12/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/setup-cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/versions/default_versions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function getLLVMDefault() {
1515
}
1616
}
1717

18-
export const DefaultVersions: Record<string, string> = {
18+
export const DefaultVersions: Record<string, string | undefined> = {
1919
llvm: getLLVMDefault(), // https://github.com/llvm/llvm-project/releases
2020
clangtidy: getLLVMDefault(),
2121
clangformat: getLLVMDefault(),

src/versions/versions.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import { DefaultLinuxVersion, DefaultVersions } from "./default_versions"
55
/** Get the default version if passed true or undefined, otherwise return the version itself */
66
export function getVersion(name: string, version: string | undefined, osVersion: number[] | null = null) {
77
if (isDefault(version, name)) {
8-
if (process.platform === "linux" && osVersion !== null && name in DefaultLinuxVersion) {
8+
if (process.platform === "linux" && osVersion !== null) {
99
return getDefaultLinuxVersion(name, osVersion)
1010
}
1111
// anything else
12-
return DefaultVersions[name]
12+
return DefaultVersions[name]! // checked by isDefault
1313
} else {
1414
return version ?? ""
1515
}
@@ -28,8 +28,8 @@ function getDefaultLinuxVersion(name: string, osVersion: number[]) {
2828
return satisfyingVersion === undefined ? "" : DefaultLinuxVersion[name][satisfyingVersion]
2929
}
3030

31-
export function isDefault(version: string | undefined, name: string) {
32-
return version === "true" || (version === undefined && name in DefaultVersions)
31+
function isDefault(version: string | undefined, name: string) {
32+
return (version === "true" || version === undefined) && name in DefaultLinuxVersion
3333
}
3434

3535
/**

0 commit comments

Comments
 (0)