From 1aea7cc2126be9fd4a45c4d57113675ac3462387 Mon Sep 17 00:00:00 2001 From: Nathan Weizenbaum Date: Wed, 17 Jun 2009 22:07:21 -0700 Subject: [PATCH] Make sure to clean up after running handle_update. --- Rakefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index 59c06f88..bfa4ce34 100644 --- a/Rakefile +++ b/Rakefile @@ -163,8 +163,6 @@ task :pages do sh %{staticmatic build .} FileUtils.mv("site", "/var/www/#{proj}-pages") - sh %{git reset --hard HEAD} - sh %{git clean -xdf} end # ----- Coverage ----- @@ -256,8 +254,12 @@ task :handle_update do sh %{git pull origin master} if ENV["REF"] == "refs/heads/master" - sh %{rake release_edge &> edge-gem-output.log} + sh %{rake release_edge} elsif ENV["REF"] =~ %r{^refs/heads/(haml|sass)-pages$} sh %{rake pages PROJ=#{$1}} end + + sh %{git reset --hard HEAD} + sh %{git clean -xdf} + sh %{git checkout master} end