diff options
| author | Andrew Konchin <[email protected]> | 2024-12-09 20:32:35 +0200 |
|---|---|---|
| committer | Benoit Daloze <[email protected]> | 2024-12-10 14:38:52 +0100 |
| commit | a90d8c335a6f5f2ae0c9480c9a546089f52e9028 (patch) | |
| tree | 58856542399f9b789c96f44ff2d59c5dad0edc81 | |
| parent | 3568e7aef7ace192297693deb770c10928ade314 (diff) | |
Update to ruby/mspec@c600b8f
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/12297
| -rw-r--r-- | spec/mspec/tool/sync/sync-rubyspec.rb | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb index 13f1d8004d..effccc1567 100644 --- a/spec/mspec/tool/sync/sync-rubyspec.rb +++ b/spec/mspec/tool/sync/sync-rubyspec.rb @@ -23,6 +23,8 @@ MSPEC = ARGV.delete('--mspec') CHECK_LAST_MERGE = !MSPEC && ENV['CHECK_LAST_MERGE'] != 'false' TEST_MASTER = ENV['TEST_MASTER'] != 'false' +ONLY_FILTER = ENV['ONLY_FILTER'] == 'true' + MSPEC_REPO = File.expand_path("../../..", __FILE__) raise MSPEC_REPO if !Dir.exist?(MSPEC_REPO) or !Dir.exist?("#{MSPEC_REPO}/.git") @@ -230,15 +232,17 @@ def main(impls) impl = RubyImplementation.new(impl, data) update_repo(impl) filter_commits(impl) - rebase_commits(impl) - if new_commits?(impl) - test_new_specs - verify_commits(impl) - fast_forward_master(impl) - check_ci - else - STDERR.puts "#{BRIGHT_YELLOW}No new commits#{RESET}" - fast_forward_master(impl) + unless ONLY_FILTER + rebase_commits(impl) + if new_commits?(impl) + test_new_specs + verify_commits(impl) + fast_forward_master(impl) + check_ci + else + STDERR.puts "#{BRIGHT_YELLOW}No new commits#{RESET}" + fast_forward_master(impl) + end end end end |