Skip to content

Commit 74aac43

Browse files
eregonfniephaus
authored andcommitted
[GR-68052] Avoid building librubyvm in ruby-lint CI job
PullRequest: truffleruby/4581
2 parents ec1939b + 7204517 commit 74aac43

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ci.jsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
537537

538538
test_builds:
539539
{
540-
# Lint runs on JDK stable because some lint tools do not work on JDK latest
541-
"ruby-lint": $.platform.linux + $.cap.tier2 + $.jdk.stable + $.use.common + $.env.jvm + $.use.build + $.run.lint + { timelimit: "45:00" },
540+
"ruby-lint": $.platform.linux + $.cap.tier1 + $.jdk.latest + $.use.common + $.env.jvm + $.use.build + $.run.lint + { timelimit: "45:00" },
542541
# Run specs on CRuby to make sure new specs are compatible and have the needed version guards
543542
"ruby-test-specs-on-cruby": $.platform.linux + $.cap.tier2 + $.use.skip_ci + $.use.common + $.run.test_specs_mri + { timelimit: "45:00" },
544543
} +
@@ -765,6 +764,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
765764
specVersion: "7",
766765
overlay: overlay,
767766
tierConfig: {
767+
"tier1": "gate",
768768
"tier2": "gate",
769769
"tier3": "gate",
770770
},

mx.truffleruby/mx_truffleruby.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ def ruby_spotbugs(args):
303303
spotbugsArgs = ['-textui', '-low', '-longBugCodes', '-include', filters]
304304
if mx.is_interactive():
305305
spotbugsArgs.append('-progress')
306-
sys.exit(mx_spotbugs.spotbugs(args, spotbugsArgs))
306+
sys.exit(mx_spotbugs.spotbugs(['--primary', *args], spotbugsArgs))
307307

308308
def verify_ci(args):
309309
"""Verify CI configuration"""

0 commit comments

Comments
 (0)