Skip to content

Commit 68c0f1c

Browse files
eregoneregon
committed
[GR-45370] Move from JDK 20 to JDK 21
PullRequest: truffleruby/3870
2 parents e539565 + 81490f4 commit 68c0f1c

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎ci.jsonnet

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -219,15 +219,15 @@ local part_definitions = {
219219
jdk: {
220220
local with_path = { environment+: { path+:: ["$JAVA_HOME/bin"] } },
221221

222-
v17: with_path + common.jdks.labsjdk17ce + {
222+
v17: with_path + common.jdks["labsjdk-ce-17"] + {
223223
environment+: {
224224
JT_JDK: "17",
225225
},
226226
},
227227

228-
v20: with_path + common.jdks.labsjdk20ce + {
228+
v21: with_path + common.jdks["labsjdk-ce-21"] + {
229229
environment+: {
230-
JT_JDK: "20",
230+
JT_JDK: "21",
231231
},
232232
},
233233
},
@@ -516,11 +516,11 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
516516

517517
# Order: platform, jdk, mx_env. Keep aligned for an easy visual comparison.
518518
"ruby-test-specs-linux-17": $.platform.linux + $.jdk.v17 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:20:00" },
519-
"ruby-test-specs-linux-20": $.platform.linux + $.jdk.v20 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:20:00" },
519+
"ruby-test-specs-linux-21": $.platform.linux + $.jdk.v21 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:20:00" },
520520
"ruby-test-specs-darwin-amd64-17": $.platform.darwin_amd64 + $.jdk.v17 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
521-
"ruby-test-specs-darwin-amd64-20": $.platform.darwin_amd64 + $.jdk.v20 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
521+
"ruby-test-specs-darwin-amd64-21": $.platform.darwin_amd64 + $.jdk.v21 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
522522
"ruby-test-specs-darwin-aarch64-17": $.platform.darwin_aarch64 + $.jdk.v17 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
523-
"ruby-test-specs-darwin-aarch64-20": $.platform.darwin_aarch64 + $.jdk.v20 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
523+
"ruby-test-specs-darwin-aarch64-21": $.platform.darwin_aarch64 + $.jdk.v21 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
524524
"ruby-test-fast-linux-aarch64": $.platform.linux_aarch64 + $.jdk.v17 + $.env.jvm + gate + $.run.test_fast + native_config + { timelimit: "45:00" },
525525
"ruby-test-fast-linux": $.platform.linux + $.jdk.v17 + $.env.jvm + gate + $.run.test_fast + { timelimit: "45:00" }, # To catch missing slow tags
526526
# "ruby-test-mri-asserts": $.platform.linux + $.jdk.v17 + $.env.jvm + gate + $.run.test_mri_fast + { timelimit: "01:20:00" }, # GR-44572, GR-44753
@@ -540,16 +540,16 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
540540
"ruby-test-standalone-linux": $.platform.linux + $.jdk.v17+ gate_no_build + $.run.test_make_standalone_distribution,
541541

542542
"ruby-test-compiler-graal-core-17": $.platform.linux + $.jdk.v17 + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
543-
"ruby-test-compiler-graal-core-20": $.platform.linux + $.jdk.v20 + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
543+
"ruby-test-compiler-graal-core-21": $.platform.linux + $.jdk.v21 + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
544544
"ruby-test-compiler-graal-enterprise-17": $.platform.linux + $.jdk.v17 + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
545-
"ruby-test-compiler-graal-enterprise-20": $.platform.linux + $.jdk.v20 + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
545+
"ruby-test-compiler-graal-enterprise-21": $.platform.linux + $.jdk.v21 + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
546546

547547
"ruby-test-svm-graal-core-linux-17": $.platform.linux + $.jdk.v17 + $.env.native + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
548-
"ruby-test-svm-graal-core-linux-20": $.platform.linux + $.jdk.v20 + $.env.native + $.env.gdb_svm + gate + native_tests,
548+
"ruby-test-svm-graal-core-linux-21": $.platform.linux + $.jdk.v21 + $.env.native + $.env.gdb_svm + gate + native_tests,
549549
"ruby-test-svm-graal-core-darwin-amd64-17": $.platform.darwin_amd64 + $.jdk.v17 + $.env.native + $.env.gdb_svm + gate + native_tests,
550-
"ruby-test-svm-graal-core-darwin-amd64-20": $.platform.darwin_amd64 + $.jdk.v20 + $.env.native + $.env.gdb_svm + gate + native_tests,
550+
"ruby-test-svm-graal-core-darwin-amd64-21": $.platform.darwin_amd64 + $.jdk.v21 + $.env.native + $.env.gdb_svm + gate + native_tests,
551551
"ruby-test-svm-graal-core-darwin-aarch64-17": $.platform.darwin_aarch64 + $.jdk.v17 + $.env.native + gate + native_tests,
552-
"ruby-test-svm-graal-core-darwin-aarch64-20": $.platform.darwin_aarch64 + $.jdk.v20 + $.env.native + gate + native_tests,
552+
"ruby-test-svm-graal-core-darwin-aarch64-21": $.platform.darwin_aarch64 + $.jdk.v21 + $.env.native + gate + native_tests,
553553
"ruby-test-svm-graal-enterprise-linux": $.platform.linux + $.jdk.v17 + $.env.native_ee + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log + { timelimit: "01:30:00" },
554554
"ruby-test-svm-graal-enterprise-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.v17 + $.env.native_ee + gate + native_tests,
555555
},

‎tool/jt.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
# Expand GEM_HOME relative to cwd so it cannot be misinterpreted later.
6565
ENV['GEM_HOME'] = File.expand_path(ENV['GEM_HOME']) if ENV['GEM_HOME']
6666

67-
JDK_VERSIONS = [17, 20]
67+
JDK_VERSIONS = [17, 21]
6868
DEFAULT_JDK_VERSION = JDK_VERSIONS.first
6969

7070
MRI_TEST_RELATIVE_PREFIX = 'test/mri/tests'

0 commit comments

Comments
 (0)