Skip to content

Commit b636b84

Browse files
update ci-overlay revision
1 parent 20c4cc2 commit b636b84

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

ci.jsonnet

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ local labsjdk_builder_version = "181ae3a6077f9bf0a117cc34562c33e871cd4ede";
77
local contains(str, needle) = std.findSubstr(needle, str) != [];
88

99
{
10-
overlay: "616937561244a0b2c6ff8e001b11b4e304a85a8a",
10+
overlay: "71bd3aa4622661dda0587fdf9000de4bb1029438",
1111
specVersion: "3",
1212

1313
mxDependencies:: {
@@ -84,14 +84,18 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
8484
devtoolset: "==7"
8585
},
8686
},
87-
LinuxAArch64(for_jdk_build):: self.Linux + self.AArch64 {
87+
LinuxAArch64(defs, for_jdk_build):: self.Linux + self.AArch64 {
8888
packages+: if for_jdk_build then {
8989
# devkit_platform_revisions in make/conf/jib-profiles.js
9090
"devkit:gcc14.2.0-OL7.6+1" : "==0"
9191
} else {
9292
# See GR-26071 as well as comment in self.LinuxAMD64
9393
devtoolset: "==7"
9494
},
95+
docker:{
96+
image: defs.linux_docker_image_amd64,
97+
mount_modules: true
98+
},
9599
},
96100
Darwin:: self.OSBase + {
97101
jdk_home(java_home):: java_home + "/../..",
@@ -370,15 +374,15 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
370374

371375
local build_confs(defs) = [
372376
self.LinuxAMD64(defs, true),
373-
self.LinuxAArch64(true),
377+
self.LinuxAArch64(defs, true),
374378
self.DarwinAMD64,
375379
self.DarwinAArch64,
376380
self.Windows + self.AMD64
377381
],
378382

379383
local graal_confs(defs) = [
380384
self.LinuxAMD64(defs, false),
381-
self.LinuxAArch64(false),
385+
self.LinuxAArch64(defs, false),
382386
self.DarwinAMD64,
383387
self.DarwinAArch64,
384388
self.Windows + self.AMD64

0 commit comments

Comments
 (0)