kotovalexarian-likes-github
/
haml--haml
mirror of https://github.com/haml/haml.git
1
0
Fork 0
Code Releases Activity

During updates, don't merge where we can reset.

This commit is contained in:
Nathan Weizenbaum 2009-06-17 22:14:14 -07:00
parent 5c11d06e3a
commit 87d9e7987a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Rakefile
View File

@ -82,8 +82,7 @@ end
task :release_edge do
sh %{git checkout edge-gem}
sh %{git fetch origin}
sh %{git merge origin/edge-gem}
sh %{git reset --hard origin/edge-gem}
sh %{git merge origin/master}
# Get the current master branch version
@ -159,7 +158,7 @@ task :pages do
require 'fileutils'
raise 'No ENV["PROJ"]!' unless proj = ENV["PROJ"]
sh %{git checkout #{proj}-pages}
sh %{git pull origin #{proj}-pages}
sh %{git reset --hard #{proj}-pages}
sh %{staticmatic build .}
FileUtils.mv("site", "/var/www/#{proj}-pages")
@ -251,7 +250,8 @@ end
task :handle_update do
sh %{git checkout master}
sh %{git pull origin master}
sh %{git fetch origin}
sh %{git reset --hard origin/master}
begin
if ENV["REF"] == "refs/heads/master"