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 llvm 15 on Fedora/Arch

This commit is contained in:
Amin Yahyaabadi 2022-12-06 22:29:32 -08:00
parent bd369094f9
commit a2e86325bf
6 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/node12/setup_cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/node12/setup_cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/node16/setup_cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/node16/setup_cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
src/__tests__/main.test.ts
View File

@ -48,9 +48,9 @@ describe("getVersion", () => {
it("llvm", () => { it("llvm", () => {
expect(getVersion("llvm", "13.0.0")).toBe("13.0.0") expect(getVersion("llvm", "13.0.0")).toBe("13.0.0")
if (process.platform === "linux") { if (process.platform === "linux") {
expect(getVersion("llvm", "true", [20, 4])).toBe("13.0.0-ubuntu-20.04") expect(getVersion("llvm", "true", [20, 4])).toBe("15.0.6-ubuntu-18.04")
expect(getVersion("llvm", "true", [18, 4])).toBe("13.0.1-ubuntu-18.04") expect(getVersion("llvm", "true", [18, 4])).toBe("15.0.6-ubuntu-18.04")
expect(getVersion("llvm", "true", [16, 4])).toBe("13.0.0-ubuntu-16.04") expect(getVersion("llvm", "true", [16, 4])).toBe("15.0.6-ubuntu-18.04")
} }
}) })
}) })

18
src/versions/default_versions.ts
View File

@ -3,10 +3,22 @@ import { isArch } from "../utils/env/isArch"
// passing "" to a tool installed by a package manager (apt, brew, choco) will result in the default version of that package manager. // passing "" to a tool installed by a package manager (apt, brew, choco) will result in the default version of that package manager.
// the directly downloaded tools require a given version ("" doesn't work). // the directly downloaded tools require a given version ("" doesn't work).
function getLLVMDefault() {
switch (process.platform) {
case "linux":
// used for non-ubuntu (Fedora, Arch)
return "15.0.6-ubuntu-18.04"
case "darwin":
return "15.0.3"
default:
return "15.0.4"
}
}
export const DefaultVersions: Record<string, string> = { export const DefaultVersions: Record<string, string> = {
llvm: process.platform === "darwin" ? "15.0.3" : "15.0.4", // https://github.com/llvm/llvm-project/releases llvm: getLLVMDefault(), // https://github.com/llvm/llvm-project/releases
clangtidy: process.platform === "darwin" ? "15.0.3" : "15.0.4", clangtidy: getLLVMDefault(),
clangformat: process.platform === "darwin" ? "15.0.3" : "15.0.4", clangformat: getLLVMDefault(),
ninja: "1.11.1", // https://github.com/ninja-build/ninja/releases ninja: "1.11.1", // https://github.com/ninja-build/ninja/releases
cmake: "3.25.0", // https://github.com/Kitware/CMake/releases cmake: "3.25.0", // https://github.com/Kitware/CMake/releases
gcovr: "5.2", // https://pypi.org/project/gcovr/ gcovr: "5.2", // https://pypi.org/project/gcovr/