From 3f36305ba20411432c703111e9e5c0de4d441f29 Mon Sep 17 00:00:00 2001 From: Eloy Duran Date: Mon, 9 Jul 2012 21:12:52 +0200 Subject: [PATCH] [Rakefile] Update release task now that `develop` is gone. --- Rakefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Rakefile b/Rakefile index 16709831e1..ec05be28e7 100644 --- a/Rakefile +++ b/Rakefile @@ -79,8 +79,8 @@ namespace :gem do task :release do unless ENV['SKIP_CHECKS'] - if `git symbolic-ref HEAD 2>/dev/null`.strip.split('/').last != 'develop' - $stderr.puts "[!] You need to be on the `develop' branch in order to be able to do a release." + if `git symbolic-ref HEAD 2>/dev/null`.strip.split('/').last != 'master' + $stderr.puts "[!] You need to be on the `master' branch in order to be able to do a release." exit 1 end @@ -120,6 +120,9 @@ namespace :gem do exit 1 end + # Ensure that the branches are up to date with the remote + sh "git pull" + puts "* Running specs" silent_sh('rake spec:all') @@ -138,19 +141,11 @@ namespace :gem do # ENV['FROM_GEM'] = '1' # silent_sh "rake examples:build" - # Ensure that the branches are up to date with the remote - sh "git pull" - # Then release 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 push origin master" sh "git push origin --tags" - sh "git checkout develop" sh "gem push #{gem_filename}" # Update the last version in CocoaPods-version.yml