Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: update Conan, Meson, Task, LLVM #210

Merged
merged 3 commits into from
Nov 15, 2023
Merged

fix: update Conan, Meson, Task, LLVM #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f59570
fix: update Conan, Meson, Task
aminya Nov 14, 2023
b532e97
fix: update llvm to 17.0.5
aminya Nov 14, 2023
7987f91
fix: use llvm 17.0.4 on Windows
aminya Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dist/actions/setup-cpp.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/actions/setup-cpp.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/legacy/setup-cpp.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/legacy/setup-cpp.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/modern/setup-cpp.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/setup-cpp.js.map
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions src/llvm/llvm_url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,12 @@ export const VERSIONS: Set<string> = getVersions([
"17.0.1",
"17.0.2",
"17.0.3",
"17.0.4",
"17.0.5",
])

/** The LLVM versions that were never released for the Windows platform. */
const WIN32_MISSING: Set<string> = new Set(["10.0.1", "15.0.5", "15.0.6"])
const WIN32_MISSING: Set<string> = new Set(["10.0.1", "15.0.5", "15.0.6", "17.0.5"])

/** The LLVM versions that were never released for the Darwin platform. */
const DARWIN_MISSING = new Set([
Expand Down Expand Up @@ -107,6 +109,8 @@ const DARWIN_MISSING = new Set([
"17.0.1",
"17.0.2",
"17.0.3",
"17.0.4",
"17.0.5",
])

/**
Expand Down Expand Up @@ -169,10 +173,12 @@ const UBUNTU_SUFFIX_MAP: { [key: string]: string } = {
"16.0.3": "-ubuntu-22.04",
"16.0.4": "-ubuntu-22.04",
"17.0.2": "-ubuntu-22.04",
"17.0.4": "-ubuntu-22.04",
"17.0.5": "-ubuntu-22.04",
}

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

//================================================
// URL
Expand Down
16 changes: 8 additions & 8 deletions src/versions/default_versions.ts
View file
Open in desktop
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.3"
return "17.0.4"
case "linux":
// used for non-ubuntu (Fedora, Arch)
return "17.0.2-ubuntu-22.04"
return "17.0.5-ubuntu-22.04"
case "darwin":
return "15.0.3"
default:
return "17.0.3"
return "17.0.5"
}
}

Expand All @@ -24,10 +24,10 @@ export const DefaultVersions: Record<string, string | undefined> = {
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.60.2", // https://github.com/conan-io/conan/releases
meson: "1.2.1", // https://github.com/mesonbuild/meson/releases
conan: "1.62.0", // https://github.com/conan-io/conan/releases
meson: "1.2.3", // https://github.com/mesonbuild/meson/releases
kcov: "42", // https://github.com/SimonKagstrom/kcov/releases
task: "3.29.1", // https://github.com/go-task/task/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/
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.2-ubuntu-22.04",
20: "17.0.2-ubuntu-22.04",
22: "17.0.5-ubuntu-22.04",
20: "17.0.5-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
Loading