Commit 1e503497 authored by Fabio Pelosin's avatar Fabio Pelosin

[Rakefile] Release from develop branch.

parent 15a42768
...@@ -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 != 'master' if `git symbolic-ref HEAD 2>/dev/null`.strip.split('/').last != 'develop'
$stderr.puts "[!] You need to be on the `master' branch in order to be able to do a release." $stderr.puts "[!] You need to be on the `develop' branch in order to be able to do a release."
exit 1 exit 1
end end
...@@ -140,6 +140,9 @@ namespace :gem do ...@@ -140,6 +140,9 @@ namespace :gem do
# Then release # Then release
sh "git commit Gemfile.lock lib/cocoapods.rb -m 'Release #{gem_version}'" sh "git commit Gemfile.lock lib/cocoapods.rb -m 'Release #{gem_version}'"
sh "git push origin develop"
sh "git checkout master"
sh "git merge develop"
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"
......
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