Skip to content

Commit 19d6503

Browse files
committed
[GR-62813] On OL9, use a different version of curl.
PullRequest: graal/20971
2 parents 224766e + 6b9f4db commit 19d6503

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

ci/common.jsonnet

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,8 @@ local common_json = import "../common.json";
286286
if (self.os == "linux" && self.arch == "amd64") then {
287287
readline: '==6.3',
288288
pcre2: '==10.37',
289-
curl: '==7.50.1',
290289
gnur: '==4.0.3-gcc4.8.5-pcre2',
291-
}
290+
} + if (std.objectHasAll(self, 'os_distro') && self['os_distro'] == 'ol' && std.objectHasAll(self, 'os_distro_version') && self['os_distro_version'] == '9') then {curl: '==7.78.0'} else {curl: '==7.50.1'}
292291
else if (self.os == "darwin" && self.arch == "amd64") then {
293292
'pcre2': '==10.37',
294293
} else {},
@@ -451,18 +450,21 @@ local common_json = import "../common.json";
451450
local aarch64 = { arch:: "aarch64", capabilities+: [self.arch] },
452451

453452
local ol_distro = { os_distro:: "ol" },
453+
local ol7_distro = ol_distro + { os_distro_version:: "7" },
454+
local ol8_distro = ol_distro + { os_distro_version:: "8" },
455+
local ol9_distro = ol_distro + { os_distro_version:: "9" },
454456

455457
linux_amd64: self.linux_amd64_ol7,
456-
linux_amd64_ol7: linux + amd64 + ol7 + ol_distro,
457-
linux_amd64_ol8: linux + amd64 + ol8 + ol_distro,
458-
linux_amd64_ol9: linux + amd64 + ol9 + ol_distro,
458+
linux_amd64_ol7: linux + amd64 + ol7 + ol7_distro,
459+
linux_amd64_ol8: linux + amd64 + ol8 + ol8_distro,
460+
linux_amd64_ol9: linux + amd64 + ol9 + ol9_distro,
459461

460462
linux_aarch64: self.linux_aarch64_ol7,
461-
linux_aarch64_ol7: linux + aarch64 + ol7 + ol_distro,
462-
linux_aarch64_ol8: linux + aarch64 + ol8 + ol_distro,
463-
linux_aarch64_ol9: linux + aarch64 + ol9 + ol_distro,
463+
linux_aarch64_ol7: linux + aarch64 + ol7 + ol7_distro,
464+
linux_aarch64_ol8: linux + aarch64 + ol8 + ol8_distro,
465+
linux_aarch64_ol9: linux + aarch64 + ol9 + ol9_distro,
464466

465-
linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu" },
467+
linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu", os_distro_version:: "22" },
466468

467469
darwin_amd64: darwin + amd64,
468470
darwin_aarch64: darwin + aarch64,

0 commit comments

Comments
 (0)