From 00c33d9c232ed1a79eda17acd7231ac93caa162b Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sat, 27 Apr 2019 18:53:20 +0200 Subject: Update to ruby/mspec@18c5a7d --- spec/mspec/tool/sync/sync-rubyspec.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'spec/mspec/tool/sync') diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb index e978ea17ec..0a6203e357 100644 --- a/spec/mspec/tool/sync/sync-rubyspec.rb +++ b/spec/mspec/tool/sync/sync-rubyspec.rb @@ -18,6 +18,9 @@ IMPLS = { MSPEC = ARGV.delete('--mspec') +CHECK_LAST_MERGE = ENV['CHECK_LAST_MERGE'] != 'false' +TEST_TRUNK = ENV['TEST_TRUNK'] != 'false' + MSPEC_REPO = File.expand_path("../../..", __FILE__) raise MSPEC_REPO if !Dir.exist?(MSPEC_REPO) or !Dir.exist?("#{MSPEC_REPO}/.git") @@ -144,7 +147,7 @@ def rebase_commits(impl) commit_date = Time.at(Integer(commit_timestamp)) days_since_last_merge = (NOW-commit_date) / 86400 - if days_since_last_merge > 60 + if CHECK_LAST_MERGE and days_since_last_merge > 60 raise "#{days_since_last_merge.floor} days since last merge, probably wrong commit" end @@ -177,7 +180,7 @@ def test_new_specs run_test[min_version] run_test[max_version] - run_test["trunk"] + run_test["trunk"] if TEST_TRUNK end end -- cgit v1.2.3