Skip to content

Commit f55ff60

Browse files
authored
Merge pull request #224 from aminya/llvm [skip ci]
Update LLVM, CMake, Meson, Task, Doxygen + Downgrade Gcovr
2 parents bdba352 + 8a8bb46 commit f55ff60

File tree

10 files changed

+33
-30
lines changed

10 files changed

+33
-30
lines changed

dist/actions/setup-cpp.js

Lines changed: 8 additions & 8 deletions
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: 2 additions & 2 deletions
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: 2 additions & 2 deletions
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_url.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export const VERSIONS: Set<string> = getVersions([
7474
"17.0.3",
7575
"17.0.4",
7676
"17.0.5",
77+
"17.0.6",
7778
])
7879

7980
/** The LLVM versions that were never released for the Windows platform. */
@@ -111,6 +112,7 @@ const DARWIN_MISSING = new Set([
111112
"17.0.3",
112113
"17.0.4",
113114
"17.0.5",
115+
"17.0.6",
114116
])
115117

116118
/**
@@ -175,10 +177,11 @@ const UBUNTU_SUFFIX_MAP: { [key: string]: string } = {
175177
"17.0.2": "-ubuntu-22.04",
176178
"17.0.4": "-ubuntu-22.04",
177179
"17.0.5": "-ubuntu-22.04",
180+
"17.0.6": "-ubuntu-22.04",
178181
}
179182

180183
/** The latest supported LLVM version for the Linux (Ubuntu) platform. */
181-
const MAX_UBUNTU: string = "17.0.5"
184+
const MAX_UBUNTU: string = "17.0.6"
182185

183186
//================================================
184187
// URL

src/python/__tests__/python.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe("setup-python", () => {
2828

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

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

3434
afterAll(async () => {

src/python/python.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,13 @@ async function ensurePipUpgrade(foundPython: string) {
238238
await execa(foundPython, ["-m", "ensurepip", "-U", "--upgrade"], { stdio: "inherit" })
239239
return true
240240
} catch (err1) {
241-
info((err1 as Error)?.toString?.())
241+
info((err1 as Error).toString())
242242
try {
243243
// ensure pip is disabled on Ubuntu
244244
await execa(foundPython, ["-m", "pip", "install", "--upgrade", "pip"], { stdio: "inherit" })
245245
return true
246246
} catch (err2) {
247-
info((err2 as Error)?.toString?.())
247+
info((err2 as Error).toString())
248248
// pip module not found
249249
}
250250
}

src/versions/default_versions.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import { isArch } from "../utils/env/isArch"
66
function getLLVMDefault() {
77
switch (process.platform) {
88
case "win32":
9-
return "17.0.4"
9+
return "17.0.6"
1010
case "linux":
1111
// used for non-ubuntu (Fedora, Arch)
12-
return "17.0.5-ubuntu-22.04"
12+
return "17.0.6-ubuntu-22.04"
1313
case "darwin":
1414
return "15.0.3"
1515
default:
16-
return "17.0.5"
16+
return "17.0.6"
1717
}
1818
}
1919

@@ -22,13 +22,13 @@ export const DefaultVersions: Record<string, string | undefined> = {
2222
clangtidy: getLLVMDefault(),
2323
clangformat: getLLVMDefault(),
2424
ninja: "1.11.1", // https://github.com/ninja-build/ninja/releases
25-
cmake: "3.27.4", // https://github.com/Kitware/CMake/releases
26-
gcovr: "6.0", // https://pypi.org/project/gcovr/
27-
conan: "1.62.0", // https://github.com/conan-io/conan/releases
28-
meson: "1.2.3", // https://github.com/mesonbuild/meson/releases
25+
cmake: "3.28.1", // https://github.com/Kitware/CMake/releases
26+
gcovr: "5.2", // "6.0", // https://pypi.org/project/gcovr/
27+
conan: "1.62.0", // 2.0.17 // https://github.com/conan-io/conan/releases
28+
meson: "1.3.1", // https://github.com/mesonbuild/meson/releases
2929
kcov: "42", // https://github.com/SimonKagstrom/kcov/releases
30-
task: "3.31.0", // https://github.com/go-task/task/releases
31-
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/
30+
task: "3.33.1", // https://github.com/go-task/task/releases
31+
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/
3232
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
3333
//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/
3434
}
@@ -54,8 +54,8 @@ export const DefaultLinuxVersion: Record<string, Record<number, string> | undefi
5454
20: "7.0.0-2",
5555
},
5656
llvm: {
57-
22: "17.0.5-ubuntu-22.04",
58-
20: "17.0.5-ubuntu-22.04",
57+
22: "17.0.6-ubuntu-22.04",
58+
20: "17.0.6-ubuntu-22.04",
5959
18: "15.0.6-ubuntu-18.04",
6060
16: "15.0.6-ubuntu-18.04",
6161
14: "13.0.0-ubuntu-16.04",

0 commit comments

Comments
 (0)