File tree Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Original file line number Diff line number Diff line change @@ -141,10 +141,10 @@ local common_json = import "../common.json";
141
141
"*.log" ,
142
142
],
143
143
144
- packages+: if self .os == "linux" && self .arch == "amd64" then {
144
+ packages+: if self .os == "linux" && self .arch == "amd64" && std.objectHas ( self , "os_distro" ) && self .os_distro == "ol" then {
145
145
"00:devtoolset" : "==7" ,
146
146
"01:binutils" : ">=2.34" ,
147
- } else if self .os == "linux" && self .arch == "aarch64" then {
147
+ } else if self .os == "linux" && self .arch == "aarch64" && std.objectHas ( self , "os_distro" ) && self .os_distro == "ol" then {
148
148
"00:devtoolset" : "==7" ,
149
149
} else {},
150
150
},
@@ -239,6 +239,12 @@ local common_json = import "../common.json";
239
239
mount_modules: true ,
240
240
},
241
241
},
242
+ local ubuntu22 = {
243
+ docker: {
244
+ image: "buildslave_ubuntu22" ,
245
+ mount_modules: true ,
246
+ },
247
+ },
242
248
local deps_linux = {
243
249
},
244
250
local deps_darwin = {
@@ -255,6 +261,7 @@ local common_json = import "../common.json";
255
261
local aarch64 = { arch:: "aarch64" , capabilities+: [self .arch] },
256
262
257
263
linux_amd64: linux + amd64 + ol7,
264
+ linux_amd64_ubuntu: linux + amd64 + ubuntu22,
258
265
linux_aarch64: linux + aarch64,
259
266
260
267
darwin_amd64: darwin + amd64,
Original file line number Diff line number Diff line change 7
7
{
8
8
"name" : "regex" ,
9
9
"subdir" : True ,
10
- "version" : "9aad6f0e2b71078b7438beb4f517955b3ca013e2 " ,
10
+ "version" : "b35d79c351230b70b9e32bc729c6495fe87ae838 " ,
11
11
"urls" : [
12
12
{"url" : "https://github.com/oracle/graal.git" , "kind" : "git" },
13
13
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots" , "kind" : "binary" },
16
16
{
17
17
"name" : "sulong" ,
18
18
"subdir" : True ,
19
- "version" : "9aad6f0e2b71078b7438beb4f517955b3ca013e2 " ,
19
+ "version" : "b35d79c351230b70b9e32bc729c6495fe87ae838 " ,
20
20
"urls" : [
21
21
{"url" : "https://github.com/oracle/graal.git" , "kind" : "git" },
22
22
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots" , "kind" : "binary" },
You can’t perform that action at this time.
0 commit comments