actions
/
setup-cpp
Template
mirror of https://github.com/aminya/setup-cpp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: fix recovering llvm from cache

This commit is contained in:
Amin Yahyaabadi 2022-01-29 16:14:55 -08:00
parent 60472486f4
commit 0db19fa5c2
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/setup_cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/setup_cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

12
src/llvm/__tests__/llvm.test.ts
View File

@ -49,6 +49,18 @@ describe("setup-llvm", () => {
expect(process.env.CXX?.includes("clang++")).toBeTruthy() expect(process.env.CXX?.includes("clang++")).toBeTruthy()
}) })
it("should find llvm in the cache", async () => {
const { binDir } = await setupLLVM("11.0.0", directory, "")
await testBin("clang++", ["--version"], binDir)
expect(binDir.includes("ToolCache")).toBeTruthy()
expect(process.env.CC?.includes("clang")).toBeTruthy()
expect(process.env.CXX?.includes("clang++")).toBeTruthy()
expect(process.env.CC?.includes("ToolCache")).toBeTruthy()
expect(process.env.CXX?.includes("ToolCache")).toBeTruthy()
})
it("should setup clang-tidy and clang-format", async () => { it("should setup clang-tidy and clang-format", async () => {
const { binDir } = await setupClangTools("11.0.0", directory, "") const { binDir } = await setupClangTools("11.0.0", directory, "")
await testBin("clang-tidy", ["--version"], binDir) await testBin("clang-tidy", ["--version"], binDir)

2
src/llvm/llvm.ts
View File

@ -242,7 +242,7 @@ export async function setupLLVM(
_arch: string _arch: string
): Promise<InstallationInfo> { ): Promise<InstallationInfo> {
const installationInfo = await setupBin("llvm", version, getLLVMPackageInfo, setupDir) const installationInfo = await setupBin("llvm", version, getLLVMPackageInfo, setupDir)
await activateLLVM(setupDir, version) await activateLLVM(installationInfo.installDir ?? setupDir, version)
return installationInfo return installationInfo
} }