Skip to content

Commit 50f05e8

Browse files
committed
CI: Add tools_java_home to jdks.
1 parent 997f96f commit 50f05e8

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

common.jsonnet

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
local common = (import "ci/common.jsonnet");
22

33
local jdks = {
4-
jdk21:: common.jdks["labsjdk-ee-21"] + {
5-
jdk:: 'jdk' + super.jdk_version,
6-
},
7-
8-
jdklatest:: common.jdks["labsjdk-ee-latest"] + {
9-
jdk:: 'jdklatest',
4+
[name]: common.jdks[name] + {
5+
jdk:: if self.jdk_name == 'jdk-latest' then 'jdklatest' else 'jdk' + super.jdk_version,
6+
tools_java_home:: {
7+
downloads+: {
8+
TOOLS_JAVA_HOME: common.jdks_data[name],
9+
},
10+
},
1011
},
12+
for name in std.objectFields(common.jdks_data)
13+
} + {
14+
# Some convenient JDK aliases
15+
jdk21:: self["labsjdk-ee-21"],
16+
jdklatest:: self["labsjdk-ee-latest"],
1117
};
1218

1319
local targets = {

0 commit comments

Comments
 (0)