Skip to content

Commit a0b93fe

Browse files
committed
CI: do not mx clean in CI
* Otherwise it would remove the GraalVM just built. * Testing that build files are not used by GraalVM is done better in GitHub Actions. * Reverts part of a162979
1 parent 1c861f5 commit a0b93fe

File tree

1 file changed

+7
-20
lines changed

1 file changed

+7
-20
lines changed

ci.jsonnet

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ local part_definitions = {
7575
environment+: { path+:: ["$MAVEN_HOME/bin"] },
7676
},
7777

78-
build_no_clean: {
78+
build: {
7979
setup+: [["mx", "sversions"]] +
8080
# aot-build.log is used for the build-stats metrics, in other cases it does no harm
8181
jt(["build", "--env", self.mx_env, "--"] + self.mx_build_options + ["|", "tee", "aot-build.log"]) +
@@ -85,13 +85,6 @@ local part_definitions = {
8585
],
8686
},
8787

88-
clean: {
89-
# Clean build results to make sure nothing refers to them while testing
90-
setup+: [["mx", "--env", self.mx_env, "clean"]],
91-
},
92-
93-
build: $.use.build_no_clean + $.use.clean,
94-
9588
truffleruby: {
9689
"$.benchmark.server":: { options: [] },
9790
environment+: {
@@ -294,13 +287,7 @@ local part_definitions = {
294287
},
295288

296289
run: {
297-
clean: {
298-
# $.use.clean but as run instead of setup
299-
run+: [["mx", "--env", self.mx_env, "clean"]],
300-
},
301-
302290
test_unit_tck: {
303-
# Run unittests first before cleaning, they need a full non-cleaned build
304291
run+: jt(["test", "unit", "--verbose"]) +
305292
jt(["test", "tck"])
306293
},
@@ -324,7 +311,7 @@ local part_definitions = {
324311
},
325312

326313
lint: {
327-
is_after:: ["$.use.build_no_clean"],
314+
is_after:: ["$.use.build"],
328315
downloads+: {
329316
JDT: { name: "ecj", version: "4.14.0", platformspecific: false },
330317
ECLIPSE: { version: "4.5.2", name: "eclipse", platformspecific: true },
@@ -482,7 +469,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
482469

483470
test_builds:
484471
{
485-
"ruby-lint": $.platform.linux + $.cap.gate + $.jdk.v11 + $.use.common + $.env.jvm + $.use.build_no_clean + $.run.lint + { timelimit: "30:00" },
472+
"ruby-lint": $.platform.linux + $.cap.gate + $.jdk.v11 + $.use.common + $.env.jvm + $.use.build + $.run.lint + { timelimit: "30:00" },
486473
# Run specs on MRI to make sure new specs are compatible and have the needed version guards
487474
"ruby-test-specs-mri": $.platform.linux + $.cap.gate + $.use.common + $.run.test_specs_mri + { timelimit: "30:00" },
488475
} +
@@ -494,10 +481,10 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
494481
local native_tests = $.run.testdownstream_aot + $.run.test_integration + $.run.test_compiler,
495482

496483
// Order: platform, jdk, mx_env. Keep aligned for an easy visual comparison.
497-
"ruby-test-specs-linux-8": $.platform.linux + $.jdk.v8 + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "50:00" },
498-
"ruby-test-specs-linux-11": $.platform.linux + $.jdk.v11 + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "50:00" },
499-
"ruby-test-specs-darwin-8": $.platform.darwin + $.jdk.v8 + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "01:35:00" },
500-
"ruby-test-specs-darwin-11": $.platform.darwin + $.jdk.v11 + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "01:35:00" },
484+
"ruby-test-specs-linux-8": $.platform.linux + $.jdk.v8 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "50:00" },
485+
"ruby-test-specs-linux-11": $.platform.linux + $.jdk.v11 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "50:00" },
486+
"ruby-test-specs-darwin-8": $.platform.darwin + $.jdk.v8 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:35:00" },
487+
"ruby-test-specs-darwin-11": $.platform.darwin + $.jdk.v11 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:35:00" },
501488
"ruby-test-fast-linux-arm64": $.platform.linux_arm64 + $.jdk.v11 + $.env.jvm + gate + $.run.test_fast + native_config + { timelimit: "30:00" },
502489
"ruby-test-fast-linux": $.platform.linux + $.jdk.v11 + $.env.jvm + gate + $.run.test_fast + { timelimit: "30:00" }, # To catch missing slow tags
503490
"ruby-test-mri-linux": $.platform.linux + $.jdk.v11 + $.env.jvm + gate + $.run.test_mri + { timelimit: "45:00" },

0 commit comments

Comments
 (0)