Skip to content

Commit 12390e9

Browse files
eregoneregon
committed
Switch to JDK latest by default in CI and for benchmarks
* Since standalones in releases use only JDK latest it seems best test it more than JDK 21.
1 parent fc24219 commit 12390e9

File tree

2 files changed

+32
-31
lines changed

2 files changed

+32
-31
lines changed

‎ci.jsonnet

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
498498

499499
test_builds:
500500
{
501+
# Lint runs on JDK stable because some lint tools do not work on JDK latest
501502
"ruby-lint": $.platform.linux + $.cap.gate + $.jdk.stable + $.use.common + $.env.jvm + $.use.build + $.run.lint + { timelimit: "45:00" },
502503
# Run specs on CRuby to make sure new specs are compatible and have the needed version guards
503504
"ruby-test-specs-on-cruby": $.platform.linux + $.cap.gate + $.use.skip_ci + $.use.common + $.run.test_specs_mri + { timelimit: "45:00" },
@@ -516,22 +517,22 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
516517
"ruby-test-specs-darwin-amd64-latest": $.platform.darwin_amd64 + $.jdk.latest + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
517518
"ruby-test-specs-darwin-aarch64-stable": $.platform.darwin_aarch64 + $.jdk.stable + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
518519
"ruby-test-specs-darwin-aarch64-latest": $.platform.darwin_aarch64 + $.jdk.latest + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
519-
"ruby-test-fast-linux-aarch64": $.platform.linux_aarch64 + $.jdk.stable + $.env.jvm + gate + $.run.test_fast + native_config + { timelimit: "45:00" },
520-
"ruby-test-fast-linux-amd64": $.platform.linux + $.jdk.stable + $.env.jvm + gate + $.run.test_fast + { timelimit: "45:00" }, # To catch missing slow tags
521-
"ruby-test-mri-asserts": $.platform.linux + $.jdk.stable + $.env.jvm + gate + $.run.test_mri_fast + { timelimit: "01:15:00" },
522-
"ruby-test-mri-linux-amd64": $.platform.linux + $.jdk.stable + $.env.native + gate + $.run.test_mri + { timelimit: "01:20:00" },
523-
# "ruby-test-mri-linux-aarch64": $.platform.linux_aarch64 + $.jdk.stable + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" }, # GR-51361
524-
"ruby-test-mri-darwin-amd64": $.platform.darwin_amd64 + $.jdk.stable + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" },
525-
"ruby-test-mri-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.stable + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" },
526-
"ruby-test-integration-linux-amd64": $.platform.linux + $.jdk.stable + $.env.jvm + gate + $.run.test_integration,
527-
"ruby-test-cexts-linux-amd64": $.platform.linux + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
528-
"ruby-test-cexts-linux-aarch64": $.platform.linux_aarch64 + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
529-
"ruby-test-cexts-darwin-amd64": $.platform.darwin_amd64 + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "01:30:00" },
530-
"ruby-test-cexts-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "00:40:00" },
531-
"ruby-test-gems-linux-amd64": $.platform.linux + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
532-
"ruby-test-gems-darwin-amd64": $.platform.darwin_amd64 + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
533-
"ruby-test-gems-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
534-
"ruby-test-ecosystem-linux-amd64": $.platform.linux + $.jdk.stable + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
520+
"ruby-test-fast-linux-aarch64": $.platform.linux_aarch64 + $.jdk.latest + $.env.jvm + gate + $.run.test_fast + native_config + { timelimit: "45:00" },
521+
"ruby-test-fast-linux-amd64": $.platform.linux + $.jdk.latest + $.env.jvm + gate + $.run.test_fast + { timelimit: "45:00" }, # To catch missing slow tags
522+
"ruby-test-mri-asserts": $.platform.linux + $.jdk.latest + $.env.jvm + gate + $.run.test_mri_fast + { timelimit: "01:15:00" },
523+
"ruby-test-mri-linux-amd64": $.platform.linux + $.jdk.latest + $.env.native + gate + $.run.test_mri + { timelimit: "01:20:00" },
524+
# "ruby-test-mri-linux-aarch64": $.platform.linux_aarch64 + $.jdk.latest + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" }, # GR-51361
525+
"ruby-test-mri-darwin-amd64": $.platform.darwin_amd64 + $.jdk.latest + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" },
526+
"ruby-test-mri-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.latest + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" },
527+
"ruby-test-integration-linux-amd64": $.platform.linux + $.jdk.latest + $.env.jvm + gate + $.run.test_integration,
528+
"ruby-test-cexts-linux-amd64": $.platform.linux + $.jdk.latest + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
529+
"ruby-test-cexts-linux-aarch64": $.platform.linux_aarch64 + $.jdk.latest + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
530+
"ruby-test-cexts-darwin-amd64": $.platform.darwin_amd64 + $.jdk.latest + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "01:30:00" },
531+
"ruby-test-cexts-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.latest + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "00:40:00" },
532+
"ruby-test-gems-linux-amd64": $.platform.linux + $.jdk.latest + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
533+
"ruby-test-gems-darwin-amd64": $.platform.darwin_amd64 + $.jdk.latest + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
534+
"ruby-test-gems-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.latest + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
535+
"ruby-test-ecosystem-linux-amd64": $.platform.linux + $.jdk.latest + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
535536

536537
"ruby-test-compiler-ce-stable": $.platform.linux + $.jdk.stable + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
537538
"ruby-test-compiler-ce-latest": $.platform.linux + $.jdk.latest + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
@@ -544,9 +545,9 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
544545
"ruby-test-svm-ce-darwin-amd64-latest": $.platform.darwin_amd64 + $.jdk.latest + $.env.native + $.env.gdb_svm + gate + native_tests,
545546
"ruby-test-svm-ce-darwin-aarch64-stable": $.platform.darwin_aarch64 + $.jdk.stable + $.env.native + gate + native_tests,
546547
"ruby-test-svm-ce-darwin-aarch64-latest": $.platform.darwin_aarch64 + $.jdk.latest + $.env.native + gate + native_tests,
547-
"ruby-test-svm-ee-linux-amd64": $.platform.linux + $.jdk.stable + $.env.native_ee + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log + { timelimit: "01:30:00" },
548-
"ruby-test-svm-ee-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.stable + $.env.native_ee + gate + native_tests,
549-
"ruby-test-svm-ee-aux-linux-amd64": $.platform.linux + $.jdk.stable + $.env.native_ee_aux + $.env.gdb_svm + gate + native_tests + { timelimit: "01:30:00" },
548+
"ruby-test-svm-ee-linux-amd64": $.platform.linux + $.jdk.latest + $.env.native_ee + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log + { timelimit: "01:30:00" },
549+
"ruby-test-svm-ee-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.latest + $.env.native_ee + gate + native_tests,
550+
"ruby-test-svm-ee-aux-linux-amd64": $.platform.linux + $.jdk.latest + $.env.native_ee_aux + $.env.gdb_svm + gate + native_tests + { timelimit: "01:30:00" },
550551
},
551552

552553
local other_rubies = {
@@ -568,15 +569,15 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
568569

569570
bench_builds:
570571
{
571-
local shared = $.platform.linux + $.jdk.stable + $.use.common +
572+
local shared = $.platform.linux + $.jdk.latest + $.use.common +
572573
$.benchmark.runner + $.benchmark.compiler_metrics + { timelimit: "01:15:00" },
573574

574575
"ruby-metrics-compiler-jvm-ce": shared + graal_configurations["jvm-ce"],
575576
"ruby-metrics-compiler-jvm-ee": shared + graal_configurations["jvm-ee"],
576577
} +
577578

578579
{
579-
local shared = $.platform.linux + $.jdk.stable + $.use.common +
580+
local shared = $.platform.linux + $.jdk.latest + $.use.common +
580581
$.benchmark.runner + $.benchmark.svm_build_stats + { timelimit: "00:20:00" },
581582
# TODO this 2 jobs have GUEST_VM_CONFIG: 'default' instead of 'truffle', why?
582583
local guest_vm_override = { environment+: { GUEST_VM_CONFIG: "default" } },
@@ -586,15 +587,15 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
586587
} +
587588

588589
{
589-
local shared = $.platform.linux + $.jdk.stable + $.use.common +
590+
local shared = $.platform.linux + $.jdk.latest + $.use.common +
590591
$.benchmark.run_svm_metrics + { timelimit: "00:45:00" },
591592

592593
"ruby-metrics-svm-ce": shared + svm_configurations["svm-ce"],
593594
"ruby-metrics-svm-ee": shared + svm_configurations["svm-ee"],
594595
} +
595596

596597
{
597-
local shared = $.platform.linux + $.jdk.stable + $.use.common +
598+
local shared = $.platform.linux + $.jdk.latest + $.use.common +
598599
$.benchmark.runner + $.benchmark.classic,
599600

600601
"ruby-benchmarks-classic-mri": shared + other_rubies.mri + { timelimit: "00:55:00" },
@@ -606,7 +607,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
606607
} +
607608

608609
{
609-
local shared = $.platform.linux + $.jdk.stable + $.use.common,
610+
local shared = $.platform.linux + $.jdk.latest + $.use.common,
610611

611612
local chunky = $.benchmark.runner + $.benchmark.chunky + { timelimit: "01:30:00" },
612613
"ruby-benchmarks-chunky-mri": shared + chunky + other_rubies.mri,
@@ -672,7 +673,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
672673

673674
{
674675
"ruby-metrics-truffle":
675-
$.platform.linux + $.jdk.stable + $.use.common + $.env.jvm + $.use.build +
676+
$.platform.linux + $.jdk.latest + $.use.common + $.env.jvm + $.use.build +
676677
$.use.truffleruby +
677678
$.cap.bench + $.cap.daily +
678679
$.benchmark.runner + $.benchmark.interpreter_metrics +
@@ -681,7 +682,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
681682

682683
{
683684
"ruby-benchmarks-cext":
684-
$.platform.linux + $.jdk.stable + $.use.common +
685+
$.platform.linux + $.jdk.latest + $.use.common +
685686
$.use.truffleruby + $.use.truffleruby_cexts +
686687
$.env.jvm_ce + $.use.build + $.use.gem_test_pack +
687688
$.cap.bench + $.cap.daily +
@@ -693,10 +694,10 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
693694
local shared = $.use.common + $.cap.manual + { timelimit: "15:00" },
694695
local native_config = $.run.generate_native_config + $.run.check_native_config,
695696

696-
"ruby-generate-native-config-linux-amd64": $.platform.linux + $.jdk.stable + shared + native_config,
697-
"ruby-generate-native-config-linux-aarch64": $.platform.linux_aarch64 + $.jdk.stable + shared + native_config,
698-
"ruby-generate-native-config-darwin-amd64": $.platform.darwin_amd64 + $.jdk.stable + shared + native_config,
699-
"ruby-generate-native-config-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.stable + shared + native_config,
697+
"ruby-generate-native-config-linux-amd64": $.platform.linux + $.jdk.latest + shared + native_config,
698+
"ruby-generate-native-config-linux-aarch64": $.platform.linux_aarch64 + $.jdk.latest + shared + native_config,
699+
"ruby-generate-native-config-darwin-amd64": $.platform.darwin_amd64 + $.jdk.latest + shared + native_config,
700+
"ruby-generate-native-config-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.latest + shared + native_config,
700701
},
701702

702703
builds:

‎test/truffle/ecosystem/truffleruby-polyglot-get-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ source test/truffle/common.sh.inc
66
jt mx --dy /vm,/graal-js sversions
77

88
jt mx --env jvm-js ruby_maven_deploy_public
9-
maven_repo="$(dirname "$(pwd)")/graal/sdk/mxbuild/jdk21/mx.sdk/public-maven-repo"
9+
maven_repo=$(echo "$(dirname "$(pwd)")"/graal/sdk/mxbuild/jdk*/mx.sdk/public-maven-repo)
1010
if [ ! -d "$maven_repo" ]; then
1111
echo "Maven repo not at $maven_repo ?"
1212
exit 2

0 commit comments

Comments
 (0)