Skip to content

Commit 005492d

Browse files
authored
Merge branch 'master' into update-rubocop-on-rbs
2 parents a378822 + 5700e5e commit 005492d

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
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: |

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)