Skip to content

Commit

Permalink
Merge pull request #224 from aminya/llvm [skip ci]
Browse files Browse the repository at this point in the history
Update LLVM, CMake, Meson, Task, Doxygen + Downgrade Gcovr
  • Loading branch information
aminya authored Jan 22, 2024
2 parents bdba352 + 8a8bb46 commit f55ff60
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 30 deletions.
16 changes: 8 additions & 8 deletions dist/actions/setup-cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/actions/setup-cpp.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/legacy/setup-cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/legacy/setup-cpp.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/modern/setup-cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/setup-cpp.js.map

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion src/llvm/llvm_url.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export const VERSIONS: Set<string> = getVersions([
"17.0.3",
"17.0.4",
"17.0.5",
"17.0.6",
])

/** The LLVM versions that were never released for the Windows platform. */
Expand Down Expand Up @@ -111,6 +112,7 @@ const DARWIN_MISSING = new Set([
"17.0.3",
"17.0.4",
"17.0.5",
"17.0.6",
])

/**
Expand Down Expand Up @@ -175,10 +177,11 @@ const UBUNTU_SUFFIX_MAP: { [key: string]: string } = {
"17.0.2": "-ubuntu-22.04",
"17.0.4": "-ubuntu-22.04",
"17.0.5": "-ubuntu-22.04",
"17.0.6": "-ubuntu-22.04",
}

/** The latest supported LLVM version for the Linux (Ubuntu) platform. */
const MAX_UBUNTU: string = "17.0.5"
const MAX_UBUNTU: string = "17.0.6"

//================================================
// URL
Expand Down
2 changes: 1 addition & 1 deletion src/python/__tests__/python.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe("setup-python", () => {

const installInfo = await setupPython(getVersion("python", "true", await ubuntuVersion()), directory, process.arch)

await testBin("python", ["--version"], installInfo?.binDir)
await testBin("python", ["--version"], installInfo.binDir)
})

afterAll(async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/python/python.ts
Original file line number Diff line number Diff line change
Expand Up @@ -238,13 +238,13 @@ async function ensurePipUpgrade(foundPython: string) {
await execa(foundPython, ["-m", "ensurepip", "-U", "--upgrade"], { stdio: "inherit" })
return true
} catch (err1) {
info((err1 as Error)?.toString?.())
info((err1 as Error).toString())
try {
// ensure pip is disabled on Ubuntu
await execa(foundPython, ["-m", "pip", "install", "--upgrade", "pip"], { stdio: "inherit" })
return true
} catch (err2) {
info((err2 as Error)?.toString?.())
info((err2 as Error).toString())
// pip module not found
}
}
Expand Down
22 changes: 11 additions & 11 deletions src/versions/default_versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import { isArch } from "../utils/env/isArch"
function getLLVMDefault() {
switch (process.platform) {
case "win32":
return "17.0.4"
return "17.0.6"
case "linux":
// used for non-ubuntu (Fedora, Arch)
return "17.0.5-ubuntu-22.04"
return "17.0.6-ubuntu-22.04"
case "darwin":
return "15.0.3"
default:
return "17.0.5"
return "17.0.6"
}
}

Expand All @@ -22,13 +22,13 @@ export const DefaultVersions: Record<string, string | undefined> = {
clangtidy: getLLVMDefault(),
clangformat: getLLVMDefault(),
ninja: "1.11.1", // https://github.com/ninja-build/ninja/releases
cmake: "3.27.4", // https://github.com/Kitware/CMake/releases
gcovr: "6.0", // https://pypi.org/project/gcovr/
conan: "1.62.0", // https://github.com/conan-io/conan/releases
meson: "1.2.3", // https://github.com/mesonbuild/meson/releases
cmake: "3.28.1", // https://github.com/Kitware/CMake/releases
gcovr: "5.2", // "6.0", // https://pypi.org/project/gcovr/
conan: "1.62.0", // 2.0.17 // https://github.com/conan-io/conan/releases
meson: "1.3.1", // https://github.com/mesonbuild/meson/releases
kcov: "42", // https://github.com/SimonKagstrom/kcov/releases
task: "3.31.0", // https://github.com/go-task/task/releases
doxygen: isArch() ? "1.9.8-1" : "1.9.8", // https://www.doxygen.nl/download.html // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen // https://formulae.brew.sh/formula/doxygen // https://archlinux.org/packages/extra/x86_64/doxygen/
task: "3.33.1", // https://github.com/go-task/task/releases
doxygen: isArch() ? "1.10.0-1" : "1.10.0", // https://www.doxygen.nl/download.html // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen // https://formulae.brew.sh/formula/doxygen // https://archlinux.org/packages/extra/x86_64/doxygen/
gcc: isArch() ? "13.2.1-3" : "13", // https://github.com/brechtsanders/winlibs_mingw/releases and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc
//mingw: isArch() ? "12.2.0-1" : "8", // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=mingw-w64 // https://archlinux.org/packages/extra/x86_64/mingw-w64-gcc/
}
Expand All @@ -54,8 +54,8 @@ export const DefaultLinuxVersion: Record<string, Record<number, string> | undefi
20: "7.0.0-2",
},
llvm: {
22: "17.0.5-ubuntu-22.04",
20: "17.0.5-ubuntu-22.04",
22: "17.0.6-ubuntu-22.04",
20: "17.0.6-ubuntu-22.04",
18: "15.0.6-ubuntu-18.04",
16: "15.0.6-ubuntu-18.04",
14: "13.0.0-ubuntu-16.04",
Expand Down

0 comments on commit f55ff60

Please sign in to comment.