Skip to content

Commit 0410c2f

Browse files
authored
Merge branch 'master' into class-module-alias-namespace
2 parents 2223292 + 5700e5e commit 0410c2f

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
3434
res = URI.parse("https://stdgems.org/bundled_gems.json").read
3535
bundled_gems = JSON.parse(res)["gems"].map{_1["gem"]}
36-
system "gem uninstall #{bundled_gems.join(" ")}", exception: true
36+
system "gem uninstall #{bundled_gems.join(" ")} --force", exception: true
3737
'
3838
- name: bundle install
3939
run: |

Gemfile.lock

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ GEM
3434
bigdecimal (3.1.9)
3535
concurrent-ruby (1.3.5)
3636
connection_pool (2.5.0)
37-
csv (3.3.2)
37+
csv (3.3.3)
3838
dbm (1.1.0)
3939
diff-lcs (1.6.0)
4040
digest (3.2.0)
@@ -120,11 +120,12 @@ GEM
120120
rubocop-ast (>= 1.38.0, < 2.0)
121121
ruby-progressbar (~> 1.7)
122122
unicode-display_width (>= 2.4.0, < 4.0)
123-
rubocop-ast (1.40.0)
124-
parser (>= 3.3.1.0)
125-
rubocop-on-rbs (1.4.2)
123+
rubocop-ast (1.41.0)
124+
parser (>= 3.3.7.2)
125+
rubocop-on-rbs (1.5.0)
126+
lint_roller (~> 1.1)
126127
rbs (~> 3.5)
127-
rubocop (~> 1.61)
128+
rubocop (>= 1.72.1, < 2.0)
128129
zlib
129130
rubocop-rubycw (0.2.2)
130131
lint_roller (~> 1.1)

Rakefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@ end
2222
Rake::TestTask.new(test: :compile, &test_config)
2323

2424
unless Gem.win_platform?
25-
require "ruby_memcheck"
25+
begin
26+
require "ruby_memcheck"
2627

27-
namespace :test do
28-
RubyMemcheck::TestTask.new(valgrind: :compile, &test_config)
28+
namespace :test do
29+
RubyMemcheck::TestTask.new(valgrind: :compile, &test_config)
30+
end
31+
rescue LoadError => exn
32+
STDERR.puts "🚨🚨🚨🚨 Skipping RubyMemcheck: #{exn.inspect} 🚨🚨🚨🚨"
2933
end
3034
end
3135

0 commit comments

Comments
 (0)