Skip to content

Commit 71d2ff1

Browse files
authored
Merge pull request #253 from aminya/versions [skip ci]
2 parents e0753dd + be629c9 commit 71d2ff1

File tree

6 files changed

+49
-31
lines changed

6 files changed

+49
-31
lines changed

dist/actions/setup-cpp.js

Lines changed: 12 additions & 12 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: 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.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: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,19 @@ export const VERSIONS: Set<string> = getVersions([
7878
"18.1.0",
7979
"18.1.1",
8080
"18.1.2",
81+
"18.1.3",
82+
"18.1.4",
83+
"18.1.5",
84+
"18.1.6",
85+
"18.1.7",
86+
"18.1.8",
8187
])
8288

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

8692
/** The LLVM versions that were never released for the Darwin platform. */
87-
const DARWIN_MISSING = new Set([
93+
const DARWIN_X64_MISSING = new Set([
8894
"3.5.1",
8995
"3.6.1",
9096
"3.6.2",
@@ -98,8 +104,6 @@ const DARWIN_MISSING = new Set([
98104
"11.0.1",
99105
"11.1.0",
100106
"12.0.1",
101-
// missing x86_64
102-
// TODO add arm64 support
103107
"15.0.4",
104108
"15.0.5",
105109
"15.0.6",
@@ -119,6 +123,12 @@ const DARWIN_MISSING = new Set([
119123
"18.1.0",
120124
"18.1.1",
121125
"18.1.2",
126+
"18.1.3",
127+
"18.1.4",
128+
"18.1.5",
129+
"18.1.6",
130+
"18.1.7",
131+
"18.1.8",
122132
])
123133

124134
/**
@@ -134,7 +144,7 @@ const UBUNTU_RC: Map<string, string> = new Map()
134144
* https://github.com/llvm/llvm-project/releases/tag/llvmorg-14.0.1 or https://releases.llvm.org/14.0.1
135145
*/
136146
// TODO change based on ubuntu version
137-
const UBUNTU_SUFFIX_MAP: { [key: string]: string } = {
147+
const UBUNTU_X64_SUFFIX_MAP: { [key: string]: string } = {
138148
"3.5.0": "-ubuntu-14.04",
139149
"3.5.1": "",
140150
"3.5.2": "-ubuntu-14.04",
@@ -172,7 +182,6 @@ const UBUNTU_SUFFIX_MAP: { [key: string]: string } = {
172182
"13.0.1": "-ubuntu-18.04",
173183
"13.0.1-ubuntu-18.04": "-ubuntu-18.04",
174184
"14.0.0": "-ubuntu-18.04",
175-
// "14.0.1": "-ubuntu-18.04", // only available for powerpc64le
176185
"15.0.2": "-rhel86",
177186
"15.0.5": "-ubuntu-18.04",
178187
"15.0.6": "-ubuntu-18.04",
@@ -184,10 +193,13 @@ const UBUNTU_SUFFIX_MAP: { [key: string]: string } = {
184193
"17.0.4": "-ubuntu-22.04",
185194
"17.0.5": "-ubuntu-22.04",
186195
"17.0.6": "-ubuntu-22.04",
196+
"18.1.4": "-ubuntu-18.04",
197+
"18.1.7": "-ubuntu-18.04",
198+
"18.1.8": "-ubuntu-18.04",
187199
}
188200

189201
/** The latest supported LLVM version for the Linux (Ubuntu) platform. */
190-
const MAX_UBUNTU: string = "17.0.6"
202+
const MAX_UBUNTU: string = "18.1.8"
191203

192204
// ================================================
193205
// URL
@@ -207,7 +219,7 @@ function getReleaseUrl(version: string, prefix: string, suffix: string): string
207219

208220
/** Gets an LLVM download URL for the Darwin platform. */
209221
function getDarwinUrl(version: string): string | null {
210-
if (DARWIN_MISSING.has(version)) {
222+
if (DARWIN_X64_MISSING.has(version)) {
211223
return null
212224
}
213225

@@ -239,11 +251,11 @@ export function getLinuxUrl(versionGiven: string): string {
239251
}
240252
linuxVersion = version.replace(givenUbuntuVersion, "")
241253
version = getSpecificVersions(VERSIONS, givenUbuntuVersion)[0]
242-
} else if (version !== "" && version in UBUNTU_SUFFIX_MAP) {
243-
linuxVersion = UBUNTU_SUFFIX_MAP[version]
254+
} else if (version !== "" && version in UBUNTU_X64_SUFFIX_MAP) {
255+
linuxVersion = UBUNTU_X64_SUFFIX_MAP[version]
244256
} else {
245257
// default to the maximum version
246-
linuxVersion = UBUNTU_SUFFIX_MAP[MAX_UBUNTU]
258+
linuxVersion = UBUNTU_X64_SUFFIX_MAP[MAX_UBUNTU]
247259
warning(`Falling back to LLVM version ${MAX_UBUNTU} ${linuxVersion} for the Ubuntu.`)
248260
}
249261

src/versions/default_versions.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ export const DefaultVersions: Record<string, string | undefined> = {
2222
llvm: getLLVMDefault(), // https://github.com/llvm/llvm-project/releases
2323
clangtidy: getLLVMDefault(),
2424
clangformat: getLLVMDefault(),
25-
ninja: "1.11.1", // https://github.com/ninja-build/ninja/releases
26-
cmake: "3.28.1", // https://github.com/Kitware/CMake/releases
25+
ninja: "1.12.1", // https://github.com/ninja-build/ninja/releases
26+
cmake: "3.30.2", // https://github.com/Kitware/CMake/releases
2727
gcovr: "5.2", // "6.0", // https://pypi.org/project/gcovr/
28-
conan: "1.62.0", // 2.0.17 // https://github.com/conan-io/conan/releases
29-
meson: "1.3.1", // https://github.com/mesonbuild/meson/releases
28+
conan: "1.64.1", // 2.0.17 // https://github.com/conan-io/conan/releases
29+
meson: "1.5.1", // https://github.com/mesonbuild/meson/releases
3030
kcov: "42", // https://github.com/SimonKagstrom/kcov/releases
31-
task: "3.33.1", // https://github.com/go-task/task/releases
32-
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/
31+
task: "3.38.0", // https://github.com/go-task/task/releases
32+
doxygen: isArch() ? "1.11.0-4" : "1.11.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/
3333
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
3434
// 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/
3535
}
@@ -110,4 +110,10 @@ export const DefaultLinuxVersion: Record<string, Record<number, string> | undefi
110110
16: "40",
111111
14: "40",
112112
},
113+
doxygen: {
114+
24: "1.11.0",
115+
22: "1.11.0",
116+
20: "1.10.0",
117+
18: "1.10.0",
118+
},
113119
}

0 commit comments

Comments
 (0)