Skip to content

Commit

Permalink
rework tasks to better integrate github release creation/tagging
Browse files Browse the repository at this point in the history
  • Loading branch information
geemus committed May 7, 2015
1 parent 6057070 commit bc71bed
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
15 changes: 7 additions & 8 deletions Rakefile
Expand Up @@ -6,6 +6,12 @@ require 'rubygems/package_task'
require 'yard'
require File.dirname(__FILE__) + '/lib/fog'

require "tasks/changelog_task"
Fog::Rake::ChangelogTask.new

require "tasks/github_release_task"
Fog::Rake::GithubReleaseTask.new

#############################################################################
#
# Helper functions
Expand Down Expand Up @@ -160,12 +166,11 @@ end

task :git_mark_release do
sh "git commit --allow-empty -a -m 'Release #{version}'"
sh "git tag v#{version}"
end

task :git_push_release do
sh "git push origin master"
sh "git push origin v#{version}"
::Rake::Task[:github_release].invoke
end

task :gem_push do
Expand Down Expand Up @@ -215,9 +220,3 @@ YARD::Rake::YardocTask.new do |t|
t.files = ['lib/**/*.rb', "README"]
t.options = ["--output-dir", YARDOC_LOCATION, "--title", "#{name} #{version}"]
end

require "tasks/changelog_task"
Fog::Rake::ChangelogTask.new

require "tasks/github_release_task"
Fog::Rake::GithubReleaseTask.new
1 change: 0 additions & 1 deletion lib/tasks/changelog_task.rb
Expand Up @@ -18,7 +18,6 @@ def initialize

add_commits_to_changelog
save_changelog
::Rake::Task[:github_release].invoke
end
end

Expand Down

0 comments on commit bc71bed

Please sign in to comment.