Skip to content

Commit af7dd8c

Browse files
authored
Merge pull request #387 from aminya/bump-llvm
fix: update default LLVM to v20 + GCC 15
2 parents 00a96b3 + b21cd99 commit af7dd8c

15 files changed

+167
-40
lines changed

dist/legacy/assets/actions_python-CuNJhsEe.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/github_brechtsanders_winlibs_mingw.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

dist/legacy/github_llvm_llvm-project.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

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/legacy/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"ninja":"1.12.1","cmake":"3.31.4","task":"3.40.1","powershell":"7.4.5","pip":">=22.2.0","python":">=3.7.9","vcpkg":{"linux":{"alpine":{"else":{"arm64":"d172727ef04337ef0021640302a9a3a91ad17414","else":""}},"else":""},"else":""},"meson":{"linux":{"ubuntu":{"20":"1.6.1","18":"0.61.4","else":"0.61.4"},"else":"1.6.1"},"else":"1.6.1"},"kcov":{"linux":{"ubuntu":{"22":"42-binary","20":"40-binary","14":"40","else":"42"},"else":"42"},"else":"42"},"doxygen":{"linux":{"archlinux":"1.13.2-1","ubuntu":{"22":"1.13.2","18":"1.10.0","else":"1.10.0"},"else":"1.13.2"},"else":"1.13.2"},"gcc":{"win32":"14.2.0posix-18.1.8-12.0.0-ucrt-r1","else":""},"mingw":{"win32":"14.2.0posix-18.1.8-12.0.0-ucrt-r1","else":""},"gcovr":{"linux":{"ubuntu":{"20":"","18":"5.0","else":"5.0"},"else":""},"else":""},"nala":{"linux":{"ubuntu":{"22":"","21":"legacy","else":"legacy"},"else":""},"else":""},"llvm":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang++":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang-tidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clangtidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang-format":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clangformat":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"}}
1+
{"ninja":"1.12.1","cmake":"3.31.4","task":"3.40.1","powershell":"7.4.5","pip":">=22.2.0","python":">=3.7.9","meson":{"linux":{"ubuntu":{"20":"1.6.1","18":"0.61.4","else":"0.61.4"},"else":"1.6.1"},"else":"1.6.1"},"kcov":{"linux":{"ubuntu":{"22":"42-binary","20":"40-binary","14":"40","else":"42"},"else":"42"},"else":"42"},"doxygen":{"linux":{"archlinux":"1.13.2-1","ubuntu":{"22":"1.13.2","18":"1.10.0","else":"1.10.0"},"else":"1.13.2"},"else":"1.13.2"},"gcc":{"win32":"15.1.0posix-12.0.0-ucrt-r1","else":""},"mingw":{"win32":"15.1.0posix-12.0.0-ucrt-r1","else":""},"gcovr":{"linux":{"ubuntu":{"20":"","18":"5.0","else":"5.0"},"else":""},"else":""},"nala":{"linux":{"ubuntu":{"22":"","21":"legacy","else":"legacy"},"else":""},"else":""},"llvm":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"},"clang":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"},"clang++":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"},"clang-tidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"},"clangtidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"},"clang-format":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"},"clangformat":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"}}

dist/modern/assets/actions_python-4hsZpmjR.mjs.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/github_brechtsanders_winlibs_mingw.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

dist/modern/github_llvm_llvm-project.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

dist/modern/setup-cpp.mjs.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/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"ninja":"1.12.1","cmake":"3.31.4","task":"3.40.1","powershell":"7.4.5","pip":">=22.2.0","python":">=3.7.9","vcpkg":{"linux":{"alpine":{"else":{"arm64":"d172727ef04337ef0021640302a9a3a91ad17414","else":""}},"else":""},"else":""},"meson":{"linux":{"ubuntu":{"20":"1.6.1","18":"0.61.4","else":"0.61.4"},"else":"1.6.1"},"else":"1.6.1"},"kcov":{"linux":{"ubuntu":{"22":"42-binary","20":"40-binary","14":"40","else":"42"},"else":"42"},"else":"42"},"doxygen":{"linux":{"archlinux":"1.13.2-1","ubuntu":{"22":"1.13.2","18":"1.10.0","else":"1.10.0"},"else":"1.13.2"},"else":"1.13.2"},"gcc":{"win32":"14.2.0posix-18.1.8-12.0.0-ucrt-r1","else":""},"mingw":{"win32":"14.2.0posix-18.1.8-12.0.0-ucrt-r1","else":""},"gcovr":{"linux":{"ubuntu":{"20":"","18":"5.0","else":"5.0"},"else":""},"else":""},"nala":{"linux":{"ubuntu":{"22":"","21":"legacy","else":"legacy"},"else":""},"else":""},"llvm":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang++":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang-tidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clangtidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang-format":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clangformat":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"}}
1+
{"ninja":"1.12.1","cmake":"3.31.4","task":"3.40.1","powershell":"7.4.5","pip":">=22.2.0","python":">=3.7.9","meson":{"linux":{"ubuntu":{"20":"1.6.1","18":"0.61.4","else":"0.61.4"},"else":"1.6.1"},"else":"1.6.1"},"kcov":{"linux":{"ubuntu":{"22":"42-binary","20":"40-binary","14":"40","else":"42"},"else":"42"},"else":"42"},"doxygen":{"linux":{"archlinux":"1.13.2-1","ubuntu":{"22":"1.13.2","18":"1.10.0","else":"1.10.0"},"else":"1.13.2"},"else":"1.13.2"},"gcc":{"win32":"15.1.0posix-12.0.0-ucrt-r1","else":""},"mingw":{"win32":"15.1.0posix-12.0.0-ucrt-r1","else":""},"gcovr":{"linux":{"ubuntu":{"20":"","18":"5.0","else":"5.0"},"else":""},"else":""},"nala":{"linux":{"ubuntu":{"22":"","21":"legacy","else":"legacy"},"else":""},"else":""},"llvm":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"},"clang":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"},"clang++":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"},"clang-tidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"},"clangtidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"},"clang-format":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"},"clangformat":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"20.1.4"}}},"linux":{"alpine":{"else":{"else":"19.1.7"}},"else":"20.1.6"},"else":"20.1.6"}}

src/gcc/__tests__/gcc.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ describe("setup-gcc", () => {
4949
}
5050
} else if (process.platform === "darwin") {
5151
// https://formulae.brew.sh/formula/gcc
52-
// As of 3, Sep, 2024
53-
gpp = "g++-14"
52+
// As of 3, Jun, 2025
53+
gpp = "g++-15"
5454
}
5555

5656
await testBin(gpp, ["--version"], installInfo?.binDir)

src/gcc/github_brechtsanders_winlibs_mingw.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
11
{
2+
"15.1.0posix-12.0.0-ucrt-r1": [
3+
"winlibs-x86_64-posix-seh-gcc-15.1.0-mingw-w64ucrt-12.0.0-r1.7z",
4+
"winlibs-i686-posix-dwarf-gcc-15.1.0-mingw-w64ucrt-12.0.0-r1.7z"
5+
],
6+
"15.1.0posix-12.0.0-msvcrt-r1": [
7+
"winlibs-x86_64-posix-seh-gcc-15.1.0-mingw-w64msvcrt-12.0.0-r1.7z",
8+
"winlibs-i686-posix-dwarf-gcc-15.1.0-mingw-w64msvcrt-12.0.0-r1.7z"
9+
],
10+
"15.1.0mcf-12.0.0-ucrt-r1": [
11+
"winlibs-x86_64-mcf-seh-gcc-15.1.0-mingw-w64ucrt-12.0.0-r1.7z",
12+
"winlibs-i686-mcf-dwarf-gcc-15.1.0-mingw-w64ucrt-12.0.0-r1.7z"
13+
],
14+
"14.3.0posix-12.0.0-ucrt-r1": [
15+
"winlibs-x86_64-posix-seh-gcc-14.3.0-mingw-w64ucrt-12.0.0-r1.7z",
16+
"winlibs-i686-posix-dwarf-gcc-14.3.0-mingw-w64ucrt-12.0.0-r1.7z"
17+
],
18+
"14.3.0posix-12.0.0-msvcrt-r1": [
19+
"winlibs-x86_64-posix-seh-gcc-14.3.0-mingw-w64msvcrt-12.0.0-r1.7z",
20+
"winlibs-i686-posix-dwarf-gcc-14.3.0-mingw-w64msvcrt-12.0.0-r1.7z"
21+
],
222
"14.2.0win32-12.0.0-msvcrt-r1": [
323
"winlibs-x86_64-win32-seh-gcc-14.2.0-mingw-w64msvcrt-12.0.0-r1.7z",
424
"winlibs-x86_64-win32-seh-gcc-14.2.0-llvm-19.1.3-mingw-w64msvcrt-12.0.0-r1.7z"

src/llvm/__tests__/llvm.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ describe("setup-llvm", () => {
3131
it("Finds valid LLVM URLs", async () => {
3232
await Promise.all(
3333
[
34+
"20",
3435
"19",
3536
"18",
3637
"17",

src/llvm/github_llvm_llvm-project.json

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,66 @@
11
{
2+
"llvmorg-20.1.6": [
3+
"clang+llvm-20.1.6-x86_64-pc-windows-msvc.tar.xz",
4+
"LLVM-20.1.6-win64.exe",
5+
"LLVM-20.1.6-win32.exe",
6+
"LLVM-20.1.6-Linux-X64.tar.xz",
7+
"LLVM-20.1.6-Linux-ARM64.tar.xz"
8+
],
9+
"llvmorg-20.1.5": [
10+
"clang+llvm-20.1.5-x86_64-pc-windows-msvc.tar.xz",
11+
"clang+llvm-20.1.5-armv7a-linux-gnueabihf.tar.gz",
12+
"clang+llvm-20.1.5-aarch64-pc-windows-msvc.tar.xz",
13+
"LLVM-20.1.5-woa64.exe",
14+
"LLVM-20.1.5-win64.exe",
15+
"LLVM-20.1.5-win32.exe",
16+
"LLVM-20.1.5-Linux-X64.tar.xz",
17+
"LLVM-20.1.5-Linux-ARM64.tar.xz"
18+
],
19+
"llvmorg-20.1.4": [
20+
"clang+llvm-20.1.4-x86_64-pc-windows-msvc.tar.xz",
21+
"clang+llvm-20.1.4-armv7a-linux-gnueabihf.tar.gz",
22+
"clang+llvm-20.1.4-aarch64-pc-windows-msvc.tar.xz",
23+
"LLVM-20.1.4-woa64.exe",
24+
"LLVM-20.1.4-win64.exe",
25+
"LLVM-20.1.4-win32.exe",
26+
"LLVM-20.1.4-macOS-ARM64.tar.xz",
27+
"LLVM-20.1.4-Linux-X64.tar.xz",
28+
"LLVM-20.1.4-Linux-ARM64.tar.xz"
29+
],
30+
"llvmorg-20.1.3": [
31+
"clang+llvm-20.1.3-x86_64-pc-windows-msvc.tar.xz",
32+
"clang+llvm-20.1.3-armv7a-linux-gnueabihf.tar.gz",
33+
"clang+llvm-20.1.3-aarch64-pc-windows-msvc.tar.xz",
34+
"LLVM-20.1.3-woa64.exe",
35+
"LLVM-20.1.3-win64.exe",
36+
"LLVM-20.1.3-win32.exe",
37+
"LLVM-20.1.3-macOS-X64.tar.xz",
38+
"LLVM-20.1.3-macOS-ARM64.tar.xz",
39+
"LLVM-20.1.3-Linux-X64.tar.xz",
40+
"LLVM-20.1.3-Linux-ARM64.tar.xz"
41+
],
42+
"llvmorg-20.1.2": [
43+
"clang+llvm-20.1.2-x86_64-pc-windows-msvc.tar.xz",
44+
"clang+llvm-20.1.2-armv7a-linux-gnueabihf.tar.gz",
45+
"clang+llvm-20.1.2-aarch64-pc-windows-msvc.tar.xz",
46+
"LLVM-20.1.2-woa64.exe",
47+
"LLVM-20.1.2-win64.exe",
48+
"LLVM-20.1.2-win32.exe",
49+
"LLVM-20.1.2-macOS-ARM64.tar.xz",
50+
"LLVM-20.1.2-Linux-X64.tar.xz",
51+
"LLVM-20.1.2-Linux-ARM64.tar.xz"
52+
],
53+
"llvmorg-20.1.1": [
54+
"clang+llvm-20.1.1-x86_64-pc-windows-msvc.tar.xz",
55+
"clang+llvm-20.1.1-armv7a-linux-gnueabihf.tar.gz",
56+
"clang+llvm-20.1.1-aarch64-pc-windows-msvc.tar.xz",
57+
"LLVM-20.1.1-woa64.exe",
58+
"LLVM-20.1.1-win64.exe",
59+
"LLVM-20.1.1-win32.exe",
60+
"LLVM-20.1.1-macOS-ARM64.tar.xz",
61+
"LLVM-20.1.1-Linux-X64.tar.xz",
62+
"LLVM-20.1.1-Linux-ARM64.tar.xz"
63+
],
264
"llvmorg-20.1.0": [
365
"clang+llvm-20.1.0-x86_64-pc-windows-msvc.tar.xz",
466
"clang+llvm-20.1.0-armv7a-linux-gnueabihf.tar.gz",

src/versions/versions.json

Lines changed: 72 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@
55
"powershell": "7.4.5",
66
"pip": ">=22.2.0",
77
"python": ">=3.7.9",
8-
"vcpkg": {
9-
"linux": {
10-
"alpine": {
11-
"else": {
12-
"arm64": "d172727ef04337ef0021640302a9a3a91ad17414",
13-
"else": ""
14-
}
15-
},
16-
"else": ""
17-
},
18-
"else": ""
19-
},
208
"meson": {
219
"linux": {
2210
"ubuntu": {
@@ -53,11 +41,11 @@
5341
"else": "1.13.2"
5442
},
5543
"gcc": {
56-
"win32": "14.2.0posix-18.1.8-12.0.0-ucrt-r1",
44+
"win32": "15.1.0posix-12.0.0-ucrt-r1",
5745
"else": ""
5846
},
5947
"mingw": {
60-
"win32": "14.2.0posix-18.1.8-12.0.0-ucrt-r1",
48+
"win32": "15.1.0posix-12.0.0-ucrt-r1",
6149
"else": ""
6250
},
6351
"gcovr": {
@@ -87,76 +75,132 @@
8775
"else": {
8876
"else": {
8977
"x64": "15.0.7",
90-
"else": "18.1.8"
78+
"else": "20.1.4"
9179
}
9280
}
9381
},
94-
"else": "19.1.6"
82+
"linux": {
83+
"alpine": {
84+
"else": {
85+
"else": "19.1.7"
86+
}
87+
},
88+
"else": "20.1.6"
89+
},
90+
"else": "20.1.6"
9591
},
9692
"clang": {
9793
"darwin": {
9894
"else": {
9995
"else": {
10096
"x64": "15.0.7",
101-
"else": "18.1.8"
97+
"else": "20.1.4"
10298
}
10399
}
104100
},
105-
"else": "19.1.6"
101+
"linux": {
102+
"alpine": {
103+
"else": {
104+
"else": "19.1.7"
105+
}
106+
},
107+
"else": "20.1.6"
108+
},
109+
"else": "20.1.6"
106110
},
107111
"clang++": {
108112
"darwin": {
109113
"else": {
110114
"else": {
111115
"x64": "15.0.7",
112-
"else": "18.1.8"
116+
"else": "20.1.4"
113117
}
114118
}
115119
},
116-
"else": "19.1.6"
120+
"linux": {
121+
"alpine": {
122+
"else": {
123+
"else": "19.1.7"
124+
}
125+
},
126+
"else": "20.1.6"
127+
},
128+
"else": "20.1.6"
117129
},
118130
"clang-tidy": {
119131
"darwin": {
120132
"else": {
121133
"else": {
122134
"x64": "15.0.7",
123-
"else": "18.1.8"
135+
"else": "20.1.4"
124136
}
125137
}
126138
},
127-
"else": "19.1.6"
139+
"linux": {
140+
"alpine": {
141+
"else": {
142+
"else": "19.1.7"
143+
}
144+
},
145+
"else": "20.1.6"
146+
},
147+
"else": "20.1.6"
128148
},
129149
"clangtidy": {
130150
"darwin": {
131151
"else": {
132152
"else": {
133153
"x64": "15.0.7",
134-
"else": "18.1.8"
154+
"else": "20.1.4"
135155
}
136156
}
137157
},
138-
"else": "19.1.6"
158+
"linux": {
159+
"alpine": {
160+
"else": {
161+
"else": "19.1.7"
162+
}
163+
},
164+
"else": "20.1.6"
165+
},
166+
"else": "20.1.6"
139167
},
140168
"clang-format": {
141169
"darwin": {
142170
"else": {
143171
"else": {
144172
"x64": "15.0.7",
145-
"else": "18.1.8"
173+
"else": "20.1.4"
146174
}
147175
}
148176
},
149-
"else": "19.1.6"
177+
"linux": {
178+
"alpine": {
179+
"else": {
180+
"else": "19.1.7"
181+
}
182+
},
183+
"else": "20.1.6"
184+
},
185+
"else": "20.1.6"
150186
},
151187
"clangformat": {
152188
"darwin": {
153189
"else": {
154190
"else": {
155191
"x64": "15.0.7",
156-
"else": "18.1.8"
192+
"else": "20.1.4"
157193
}
158194
}
159195
},
160-
"else": "19.1.6"
196+
"linux": {
197+
"alpine": {
198+
"else": {
199+
"else": "19.1.7"
200+
}
201+
},
202+
"else": "20.1.6"
203+
},
204+
"else": "20.1.6"
161205
}
162206
}

0 commit comments

Comments
 (0)