Skip to content

Commit f70da08

Browse files
committed
labsjdk-ce-17 is back, use it by default as it more stable than 20-dev
1 parent 736f9d9 commit f70da08

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ local part_definitions = {
229229

230230
v17: with_path {
231231
downloads+: {
232-
JAVA_HOME: common.jdks["labsjdk-ee-17"],
232+
JAVA_HOME: common.jdks["labsjdk-ce-17"],
233233
},
234234
environment+: {
235235
JT_JDK: "17",

tool/jt.rb

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
ENV['GEM_HOME'] = File.expand_path(ENV['GEM_HOME']) if ENV['GEM_HOME']
6666

6767
JDK_VERSIONS = [17, 20]
68-
DEFAULT_JDK_VERSION = JDK_VERSIONS.last
68+
DEFAULT_JDK_VERSION = JDK_VERSIONS.first
6969

7070
MRI_TEST_RELATIVE_PREFIX = 'test/mri/tests'
7171
MRI_TEST_PREFIX = "#{TRUFFLERUBY_DIR}/#{MRI_TEST_RELATIVE_PREFIX}"
@@ -175,12 +175,7 @@ def ee?
175175
end
176176

177177
def ee_jdk?
178-
if @jdk_version == 17
179-
# No labsjdk-ce-17 in common.json
180-
true
181-
else
182-
ee?
183-
end
178+
ee?
184179
end
185180

186181
def jvmci_version

0 commit comments

Comments
 (0)