kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Update to ruby/mspec@6c95759

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eregon 2017-05-27 21:54:38 +00:00
parent d97c171b90
commit 24db428785
4 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spec/mspec/tool/sync/sync-rubyspec.rb
View file

@ -14,6 +14,7 @@ IMPLS = {
git: "https://github.com/ruby/ruby.git",
master: "trunk",
prefix: "spec/rubyspec",
merge_message: "Update to ruby/spec@",
},
}
@ -52,6 +53,10 @@ class RubyImplementation
"#{from}..." if from
end
def last_merge_message
@data[:merge_message] || "Merge ruby/spec commit"
end
def prefix
@data[:prefix] || "spec/ruby"
end
@ -113,7 +118,7 @@ def rebase_commits(impl)
if ENV["LAST_MERGE"]
last_merge = `git log -n 1 --format='%H %ct' #{ENV["LAST_MERGE"]}`
else
last_merge = `git log --grep='Merge ruby/spec commit' -n 1 --format='%H %ct'`
last_merge = `git log --grep='#{impl.last_merge_message}' -n 1 --format='%H %ct'`
end
last_merge, commit_timestamp = last_merge.chomp.split(' ')
@ -167,6 +172,8 @@ def verify_commits(impl)
end
puts "Manually check commit messages:"
print "Press enter >"
STDIN.gets
sh "git", "log", "master..."
end
end
@ -183,6 +190,7 @@ def check_ci
puts <<-EOS
Push to master, and check that the CI passes:
https://github.com/ruby/spec/commits/master
EOS
end