Skip to content

Commit 4885cf4

Browse files
authored
Merge pull request #2084 from ruby/skip-rbs-validation
Skip `rbs` gem validation
2 parents d9000d2 + f6213c2 commit 4885cf4

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

Gemfile.lock

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ GEM
1313
remote: https://rubygems.org/
1414
specs:
1515
abbrev (0.1.2)
16-
activesupport (7.2.1)
16+
activesupport (8.0.0)
1717
base64
18+
benchmark (>= 0.3)
1819
bigdecimal
1920
concurrent-ruby (~> 1.0, >= 1.3.1)
2021
connection_pool (>= 2.2.5)
@@ -24,10 +25,12 @@ GEM
2425
minitest (>= 5.1)
2526
securerandom (>= 0.3)
2627
tzinfo (~> 2.0, >= 2.0.5)
28+
uri (>= 0.13.1)
2729
addressable (2.8.7)
2830
public_suffix (>= 2.0.2, < 7.0)
2931
ast (2.4.2)
3032
base64 (0.2.0)
33+
benchmark (0.4.0)
3134
benchmark-ips (2.14.0)
3235
bigdecimal (3.1.8)
3336
concurrent-ruby (1.3.4)
@@ -117,9 +120,9 @@ GEM
117120
rubocop-rubycw (0.1.6)
118121
rubocop (~> 1.0)
119122
ruby-progressbar (1.13.0)
120-
securerandom (0.3.1)
123+
securerandom (0.3.2)
121124
stackprof (0.2.26)
122-
steep (1.8.0)
125+
steep (1.8.3)
123126
activesupport (>= 5.1)
124127
concurrent-ruby (>= 1.1.10)
125128
csv (>= 3.0.9)
@@ -146,6 +149,7 @@ GEM
146149
tzinfo (2.0.6)
147150
concurrent-ruby (~> 1.0)
148151
unicode-display_width (2.6.0)
152+
uri (1.0.2)
149153
zlib (3.1.1)
150154

151155
PLATFORMS

Rakefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,12 @@ task :validate => :compile do
6363
# Skip RBS validation because Ruby CI runs without rubygems
6464
case skip_rbs_validation = ENV["SKIP_RBS_VALIDATION"]
6565
when nil
66-
libs << "rbs"
66+
begin
67+
Gem::Specification.find_by_name("rbs")
68+
libs << "rbs"
69+
rescue Gem::MissingSpecError
70+
STDERR.puts "🚨🚨🚨🚨 Skipping `rbs` gem because it's not found"
71+
end
6772
when "true"
6873
# Skip
6974
else
@@ -90,7 +95,7 @@ task :stdlib_test => :compile do
9095
if ENV["RANDOMIZE_STDLIB_TEST_ORDER"] == "true"
9196
test_files.shuffle!
9297
end
93-
98+
9499
sh "#{ruby} -Ilib #{bin}/test_runner.rb #{test_files.join(' ')}"
95100
# TODO: Ractor tests need to be run in a separate process
96101
sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/Ractor_test.rb"

0 commit comments

Comments
 (0)