Skip to content

Commit d321271

Browse files
committed
fix: set older default only for ubuntu 18
1 parent 870172d commit d321271

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

dist/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/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/__tests__/main.test.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ describe("syncVersion", () => {
3333
expect(syncVersions(opts, llvmTools)).toBe(true)
3434
expect(opts.llvm).toBe(opts.clangtidy)
3535
})
36+
})
3637

37-
describe("getVersion", () => {
38-
it("gcovr", () => {
39-
expect(getVersion("gcovr", "5.0")).toBe("5.0")
40-
if (process.platform === "linux") {
41-
expect(getVersion("gcovr", "true", [20, 4])).toBe("5.1")
42-
expect(getVersion("gcovr", "true", [18, 4])).toBe("5.0")
43-
}
44-
})
38+
describe("getVersion", () => {
39+
it("gcovr", () => {
40+
expect(getVersion("gcovr", "5.0")).toBe("5.0")
41+
if (process.platform === "linux") {
42+
expect(getVersion("gcovr", "true", [20, 4])).toBe("5.1")
43+
expect(getVersion("gcovr", "true", [18, 4])).toBe("5.0")
44+
}
45+
})
4546

46-
it("llvm", () => {
47-
expect(getVersion("llvm", "13.0.0")).toBe("13.0.0")
48-
if (process.platform === "linux") {
49-
expect(getVersion("llvm", "true", [20, 4])).toBe("13.0.0-ubuntu-20.04")
50-
expect(getVersion("llvm", "true", [18, 4])).toBe("13.0.1-ubuntu-18.04")
51-
expect(getVersion("llvm", "true", [16, 4])).toBe("13.0.0-ubuntu-16.04")
52-
}
53-
})
47+
it("llvm", () => {
48+
expect(getVersion("llvm", "13.0.0")).toBe("13.0.0")
49+
if (process.platform === "linux") {
50+
expect(getVersion("llvm", "true", [20, 4])).toBe("13.0.0-ubuntu-20.04")
51+
expect(getVersion("llvm", "true", [18, 4])).toBe("13.0.1-ubuntu-18.04")
52+
expect(getVersion("llvm", "true", [16, 4])).toBe("13.0.0-ubuntu-16.04")
53+
}
5454
})
5555
})

src/default_versions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ export function getVersion(name: string, version: string | undefined, osVersion:
2929
if (osVersion[0] < 20) {
3030
switch (name) {
3131
case "gcovr":
32-
return "5.0"
32+
return osVersion[0] === 18 ? "5.0" : "" /* pip default */
3333
case "meson":
34-
return "0.61.4"
34+
return osVersion[0] === 18 ? "0.61.4" : "" /* pip default */
3535
case "doxygen":
3636
return "1.9.1"
3737
default: {

0 commit comments

Comments
 (0)