Skip to content

Commit e1e0b4c

Browse files
committed
[GR-14768] Build a GraalVM directly with the right SVM options for testing Ruby
* Remove Linux debug build, it cannot easily run in the same gate and is already tested in the SVM gate. * Remove svm_test_platforms as it's just shared options + platform.
1 parent 2f8f3cc commit e1e0b4c

File tree

1 file changed

+27
-13
lines changed

1 file changed

+27
-13
lines changed

ci.jsonnet

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ local part_definitions = {
252252
self.svm_suite + ",truffleruby",
253253
"--disable-polyglot",
254254
"--disable-libpolyglot",
255-
"--force-bash-launchers=lli,truffleruby",
255+
"--force-bash-launchers=lli,native-image",
256256
"gate",
257257
"--no-warning-as-error",
258258
"--tags",
@@ -557,23 +557,37 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
557557
"ruby-test-cexts-darwin": darwin_gate + $.use.gem_test_pack + $.run.test_cexts,
558558
} +
559559

560-
local svm_test_platforms = {
561-
local shared = $.jdk.labsjdk8 + $.use.common + $.use.svm + $.cap.gate + $.svm.gate,
562-
563-
linux: $.platform.linux + shared + { "$.svm.gate":: { tags: "build,ruby_debug,ruby_product" } },
564-
darwin: $.platform.darwin + shared + { "$.svm.gate":: { tags: "build,darwin_ruby" } },
565-
};
560+
local svm_test_shared = $.jdk.labsjdk8 + $.use.common + $.use.svm + $.cap.gate + $.svm.gate;
566561
{
567-
local shared = $.use.build + $.svm.core + { timelimit: "01:00:00" },
568-
local tag_override = { "$.svm.gate":: { tags: "build,ruby" } },
562+
local shared = $.use.build + $.svm.core + {
563+
"$.svm.gate":: {
564+
tags: "build,ruby"
565+
},
566+
environment+: {
567+
EXTRA_IMAGE_BUILDER_ARGUMENTS: "-H:GreyToBlackObjectVisitorDiagnosticHistory=16", # GR-9912
568+
},
569+
timelimit: "01:00:00",
570+
},
569571

570-
"ruby-test-svm-graal-core-linux": shared + svm_test_platforms.linux + tag_override,
571-
"ruby-test-svm-graal-core-darwin": shared + svm_test_platforms.darwin + tag_override,
572+
"ruby-test-svm-graal-core-linux": $.platform.linux + svm_test_shared + shared,
573+
"ruby-test-svm-graal-core-darwin": $.platform.darwin + svm_test_shared + shared,
572574
} + {
573575
local shared = $.use.build + $.svm.enterprise + { timelimit: "01:15:00" },
574576

575-
"ruby-test-svm-graal-enterprise-linux": shared + svm_test_platforms.linux,
576-
"ruby-test-svm-graal-enterprise-darwin": shared + svm_test_platforms.darwin,
577+
"ruby-test-svm-graal-enterprise-linux": $.platform.linux + svm_test_shared + shared + {
578+
"$.svm.gate":: {
579+
tags: "build,ruby_product"
580+
},
581+
environment+: {
582+
EXTRA_IMAGE_BUILDER_ARGUMENTS: "-H:+VerifyGraalGraphs -H:+VerifyPhases -H:+AOTPriorityInline -H:+VerifyDeoptimizationEntryPoints",
583+
},
584+
},
585+
"ruby-test-svm-graal-enterprise-darwin": $.platform.darwin + svm_test_shared + shared + {
586+
"$.svm.gate":: {
587+
tags: "build,darwin_ruby"
588+
},
589+
# No extra verifications, this CI job is already slow
590+
},
577591
},
578592

579593
local other_rubies = {

0 commit comments

Comments
 (0)