1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to ruby/mspec@c600b8f

Browse Source
This commit is contained in:
Andrew Konchin 2024-12-09 20:32:35 +02:00 committed by Benoit Daloze
parent 3568e7aef7
commit a90d8c335a
Notes: git 2024-12-10 13:39:11 +00:00 
Merged: https://github.com/ruby/ruby/pull/12297
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spec/mspec/tool/sync/sync-rubyspec.rb
View File

@ -23,6 +23,8 @@ MSPEC = ARGV.delete('--mspec')
CHECK_LAST_MERGE = !MSPEC && ENV['CHECK_LAST_MERGE'] != 'false' CHECK_LAST_MERGE = !MSPEC && ENV['CHECK_LAST_MERGE'] != 'false'
TEST_MASTER = ENV['TEST_MASTER'] != 'false' TEST_MASTER = ENV['TEST_MASTER'] != 'false'
ONLY_FILTER = ENV['ONLY_FILTER'] == 'true'
MSPEC_REPO = File.expand_path("../../..", __FILE__) MSPEC_REPO = File.expand_path("../../..", __FILE__)
raise MSPEC_REPO if !Dir.exist?(MSPEC_REPO) or !Dir.exist?("#{MSPEC_REPO}/.git") 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) impl = RubyImplementation.new(impl, data)
update_repo(impl) update_repo(impl)
filter_commits(impl) filter_commits(impl)
rebase_commits(impl) unless ONLY_FILTER
if new_commits?(impl) rebase_commits(impl)
test_new_specs if new_commits?(impl)
verify_commits(impl) test_new_specs
fast_forward_master(impl) verify_commits(impl)
check_ci fast_forward_master(impl)
else check_ci
STDERR.puts "#{BRIGHT_YELLOW}No new commits#{RESET}" else
fast_forward_master(impl) STDERR.puts "#{BRIGHT_YELLOW}No new commits#{RESET}"
fast_forward_master(impl)
end
end end
end end
end end