@@ -150,6 +150,13 @@ local common_json = import "../common.json";
150
150
} else {},
151
151
},
152
152
153
+ black:: {
154
+ packages+: {
155
+ # black is used to format python source code
156
+ "pip:black" : common_json.pip.black,
157
+ },
158
+ },
159
+
153
160
local code_tools = {
154
161
downloads+: if 'jdk_version' in self && self .jdk_version > 21 then {
155
162
TOOLS_JAVA_HOME: jdks_data['oraclejdk21' ],
@@ -181,12 +188,7 @@ local common_json = import "../common.json";
181
188
graalnodejs:: {
182
189
packages+: if self .os == "linux" then {
183
190
cmake: "==3.22.2" ,
184
- } + (if self .arch == "aarch64" then {
185
- "00:devtoolset" : "==10" ,
186
- } else {
187
- "00:devtoolset" : "==11" ,
188
- })
189
- else {},
191
+ } else {},
190
192
},
191
193
192
194
svm:: {
@@ -203,14 +205,6 @@ local common_json = import "../common.json";
203
205
"*/callgrind.*" ,
204
206
"*.log" ,
205
207
],
206
-
207
- packages+: if self .os == "linux" && std.objectHas (self , "os_distro" ) && self .os_distro == "ol" then
208
- (if self .arch == "aarch64" then {
209
- "00:devtoolset" : "==10" ,
210
- } else {
211
- "00:devtoolset" : "==11" ,
212
- })
213
- else {},
214
208
},
215
209
},
216
210
@@ -307,6 +301,12 @@ local common_json = import "../common.json";
307
301
mount_modules: true ,
308
302
},
309
303
},
304
+ local ol8 = {
305
+ docker+: {
306
+ image: "buildslave_ol8" ,
307
+ mount_modules: true ,
308
+ },
309
+ },
310
310
local ol9 = {
311
311
docker+: {
312
312
image: "buildslave_ol9" ,
@@ -326,28 +326,39 @@ local common_json = import "../common.json";
326
326
local deps_windows = {
327
327
},
328
328
329
+ local ol_devtoolset = {
330
+ packages+: (if self .arch == "aarch64" then {
331
+ "00:devtoolset" : "==10" , # GCC 10.2.1, make 4.2.1, binutils 2.35, valgrind 3.16.1
332
+ } else {
333
+ "00:devtoolset" : "==11" , # GCC 11.2, make 4.3, binutils 2.36, valgrind 3.17
334
+ }),
335
+ },
336
+
329
337
local linux = deps_linux + common + { os:: "linux" , capabilities+: [self .os] },
330
338
local darwin = deps_darwin + common + { os:: "darwin" , capabilities+: [self .os] },
331
339
local windows = deps_windows + common + { os:: "windows" , capabilities+: [self .os] },
332
340
local windows_server_2016 = windows + { capabilities+: ["windows_server_2016" ] },
333
341
334
342
local amd64 = { arch:: "amd64" , capabilities+: [self .arch] },
335
343
local aarch64 = { arch:: "aarch64" , capabilities+: [self .arch] },
336
- local ol_distro = {os_distro:: "ol" },
344
+ # Always include the devtoolset on Oracle Linux to use the same system toolchain for all builds
345
+ local ol_distro = { os_distro:: "ol" } + ol_devtoolset,
337
346
338
347
linux_amd64: linux + amd64 + ol7 + ol_distro,
339
- linux_amd64_ubuntu : linux + amd64 + ubuntu22 + { os_distro:: "ubuntu" } ,
348
+ linux_amd64_ol8 : linux + amd64 + ol8 + ol_distro ,
340
349
linux_amd64_ol9: linux + amd64 + ol9 + ol_distro,
341
350
linux_aarch64: linux + aarch64 + ol_distro,
351
+ linux_aarch64_ol8: linux + aarch64 + ol8 + ol_distro,
342
352
linux_aarch64_ol9: linux + aarch64 + ol9 + ol_distro,
343
353
354
+ linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu" },
355
+
344
356
darwin_amd64: darwin + amd64,
345
357
darwin_aarch64: darwin + aarch64,
346
358
347
359
windows_amd64: windows + amd64,
348
360
windows_server_2016_amd64: windows_server_2016 + amd64,
349
361
350
-
351
362
# Utils
352
363
disable_proxies: {
353
364
setup+: [
0 commit comments