Skip to content

Commit 6b9f4db

Browse files
committed
Do not use common utils in the common CI file.
This file is copied to other repos, but the common utils are not.
1 parent 74f0810 commit 6b9f4db

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

ci/common.jsonnet

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# Note that using a os-arch mixin like linux_amd64 mixin is required for using common.deps.
55

66
local common_json = import "../common.json";
7-
local std_get = (import "ci_common/common-utils.libsonnet").std_get;
87

98
{
109
# JDK definitions
@@ -288,7 +287,7 @@ local std_get = (import "ci_common/common-utils.libsonnet").std_get;
288287
readline: '==6.3',
289288
pcre2: '==10.37',
290289
gnur: '==4.0.3-gcc4.8.5-pcre2',
291-
} + if (std_get(self, 'os_distro', '') == 'ol' && std_get(self, 'os_distro_version', '') == '9') then {curl: '==7.78.0'} else {curl: '==7.50.1'}
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 {},

0 commit comments

Comments
 (0)