Skip to content

Commit 29399c3

Browse files
committed
fix: fix linux binaries for llvm
1 parent 1556e01 commit 29399c3

File tree

8 files changed

+32
-30
lines changed

8 files changed

+32
-30
lines changed

dist/actions/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/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: 8 additions & 8 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ export const VERSIONS: Set<string> = getVersions([
7777
"17.0.6",
7878
"18.1.0",
7979
"18.1.1",
80+
"18.1.2",
8081
])
8182

8283
/** The LLVM versions that were never released for the Windows platform. */
@@ -117,6 +118,7 @@ const DARWIN_MISSING = new Set([
117118
"17.0.6",
118119
"18.1.0",
119120
"18.1.1",
121+
"18.1.2",
120122
])
121123

122124
/**
@@ -182,12 +184,10 @@ const UBUNTU_SUFFIX_MAP: { [key: string]: string } = {
182184
"17.0.4": "-ubuntu-22.04",
183185
"17.0.5": "-ubuntu-22.04",
184186
"17.0.6": "-ubuntu-22.04",
185-
"18.1.0": "-ubuntu-22.04",
186-
"18.1.1": "-ubuntu-22.04",
187187
}
188188

189189
/** The latest supported LLVM version for the Linux (Ubuntu) platform. */
190-
const MAX_UBUNTU: string = "18.1.1"
190+
const MAX_UBUNTU: string = "17.0.6"
191191

192192
//================================================
193193
// URL

src/versions/default_versions.ts

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ import { isArch } from "../utils/env/isArch"
66
function getLLVMDefault() {
77
switch (process.platform) {
88
case "win32":
9-
return "18.1.1"
9+
return "18.1.2"
1010
case "linux":
1111
// used for non-ubuntu (Fedora, Arch)
12-
return "18.1.1-ubuntu-22.04"
12+
// the suffixes relate to the suffix in the llvm releases
13+
return "17.0.6-ubuntu-22.04"
1314
case "darwin":
1415
return "15.0.3"
1516
default:
16-
return "18.1.1"
17+
return "18.1.2"
1718
}
1819
}
1920

@@ -53,24 +54,25 @@ export const DefaultLinuxVersion: Record<string, Record<number, string> | undefi
5354
22: "8.0.0-1",
5455
20: "7.0.0-2",
5556
},
57+
// the suffixes relate to the suffix in the llvm releases
5658
llvm: {
57-
22: "18.1.1-ubuntu-22.04",
58-
20: "18.1.1-ubuntu-22.04",
59-
18: "18.1.1-ubuntu-22.04",
59+
22: "18.1.2",
60+
20: "18.1.2",
61+
18: "15.0.6-ubuntu-18.04",
6062
16: "15.0.6-ubuntu-18.04",
6163
14: "13.0.0-ubuntu-16.04",
6264
},
6365
clangtidy: {
64-
22: "18.1.1-ubuntu-22.04",
65-
20: "18.1.1-ubuntu-22.04",
66-
18: "18.1.1-ubuntu-22.04",
66+
22: "18.1.2",
67+
20: "18.1.2",
68+
18: "15.0.6-ubuntu-18.04",
6769
16: "15.0.6-ubuntu-18.04",
6870
14: "13.0.0-ubuntu-16.04",
6971
},
7072
clangformat: {
71-
22: "18.1.1-ubuntu-22.04",
72-
20: "18.1.1-ubuntu-22.04",
73-
18: "18.1.1-ubuntu-22.04",
73+
22: "18.1.2",
74+
20: "18.1.2",
75+
18: "15.0.6-ubuntu-18.04",
7476
16: "15.0.6-ubuntu-18.04",
7577
14: "13.0.0-ubuntu-16.04",
7678
},

0 commit comments

Comments
 (0)