Commit 3f36305b authored by Eloy Duran's avatar Eloy Duran

[Rakefile] Update release task now that `develop` is gone.

parent 7149df10
...@@ -79,8 +79,8 @@ namespace :gem do ...@@ -79,8 +79,8 @@ namespace :gem do
task :release do task :release do
unless ENV['SKIP_CHECKS'] unless ENV['SKIP_CHECKS']
if `git symbolic-ref HEAD 2>/dev/null`.strip.split('/').last != 'develop' if `git symbolic-ref HEAD 2>/dev/null`.strip.split('/').last != 'master'
$stderr.puts "[!] You need to be on the `develop' branch in order to be able to do a release." $stderr.puts "[!] You need to be on the `master' branch in order to be able to do a release."
exit 1 exit 1
end end
...@@ -120,6 +120,9 @@ namespace :gem do ...@@ -120,6 +120,9 @@ namespace :gem do
exit 1 exit 1
end end
# Ensure that the branches are up to date with the remote
sh "git pull"
puts "* Running specs" puts "* Running specs"
silent_sh('rake spec:all') silent_sh('rake spec:all')
...@@ -138,19 +141,11 @@ namespace :gem do ...@@ -138,19 +141,11 @@ namespace :gem do
# ENV['FROM_GEM'] = '1' # ENV['FROM_GEM'] = '1'
# silent_sh "rake examples:build" # silent_sh "rake examples:build"
# Ensure that the branches are up to date with the remote
sh "git pull"
# Then release # Then release
sh "git commit lib/cocoapods.rb -m 'Release #{gem_version}'" sh "git commit lib/cocoapods.rb -m 'Release #{gem_version}'"
sh "git push origin develop"
sh "git checkout master"
sh "git pull"
sh "git merge develop -m 'Release #{gem_version}'"
sh "git tag -a #{gem_version} -m 'Release #{gem_version}'" sh "git tag -a #{gem_version} -m 'Release #{gem_version}'"
sh "git push origin master" sh "git push origin master"
sh "git push origin --tags" sh "git push origin --tags"
sh "git checkout develop"
sh "gem push #{gem_filename}" sh "gem push #{gem_filename}"
# Update the last version in CocoaPods-version.yml # Update the last version in CocoaPods-version.yml
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment