Skip to content

Commit da1eb59

Browse files
committed
fix: install clang-tidy and clang-format as well
1 parent ccddfed commit da1eb59

File tree

9 files changed

+25
-22
lines changed

9 files changed

+25
-22
lines changed

dist/actions/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/actions/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/legacy/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/legacy/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/modern/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/modern/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/llvm/llvm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ async function setupLLVMApt(majorVersion: number): Promise<InstallationInfo> {
6464
const neededPackages = await patchAptLLVMScript("/tmp/llvm.sh", "/tmp/llvm-setup-cpp.sh")
6565
await setupAptPack(neededPackages)
6666
await chmod("/tmp/llvm-setup-cpp.sh", "755")
67-
await execRoot("bash", ["/tmp/llvm-setup-cpp.sh", majorVersion.toString()], {
67+
await execRoot("bash", ["/tmp/llvm-setup-cpp.sh", "all", majorVersion.toString()], {
6868
stdio: "inherit",
6969
shell: true,
7070
})

src/utils/tests/test-helpers.ts

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,24 @@ export async function testBin(
3535
args: string[] | null = ["--version"],
3636
binDir: string | undefined = undefined
3737
) {
38-
let bin = name
39-
if (typeof binDir === "string") {
40-
console.log(`Testing the existence of ${binDir}`)
41-
expect(binDir).toBeDefined()
42-
expect(binDir).not.toHaveLength(0)
43-
expect(await pathExists(binDir)).toBeTruthy()
44-
bin = join(binDir, addExeExt(name))
45-
}
38+
try {
39+
let bin = name
40+
if (typeof binDir === "string") {
41+
console.log(`Testing the existence of ${binDir}`)
42+
expect(binDir).toBeDefined()
43+
expect(binDir).not.toHaveLength(0)
44+
expect(await pathExists(binDir)).toBeTruthy()
45+
bin = join(binDir, addExeExt(name))
46+
}
4647

47-
if (args !== null) {
48-
console.log(`Running ${bin} ${args.join(" ")}`)
49-
const { status } = spawn.sync(bin, args, { stdio: "inherit" })
50-
expect(status).toBe(0)
51-
}
48+
if (args !== null) {
49+
console.log(`Running ${bin} ${args.join(" ")}`)
50+
const { status } = spawn.sync(bin, args, { stdio: "inherit" })
51+
expect(status).toBe(0)
52+
}
5253

53-
expect((await io.which(name, true)).includes(bin))
54+
expect((await io.which(name, true)).includes(bin))
55+
} catch (err) {
56+
throw new Error(`Failed to test bin ${name}: ${err}`)
57+
}
5458
}

src/versions/versions.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { DefaultLinuxVersion, DefaultVersions } from "./default_versions"
44

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) {
7-
console.log("isDefault", version, name, isVersionDefault(version))
87
if (isVersionDefault(version) && process.platform === "linux" && osVersion !== null && name in DefaultLinuxVersion) {
98
return getDefaultLinuxVersion(osVersion, DefaultLinuxVersion[name]!)
109
} else if (isVersionDefault(version) && name in DefaultVersions) {

0 commit comments

Comments
 (0)