mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Make sure that the update cleanup happens.
This commit is contained in:
parent
1aea7cc212
commit
5c11d06e3a
1 changed files with 10 additions and 8 deletions
18
Rakefile
18
Rakefile
|
@ -253,13 +253,15 @@ task :handle_update do
|
|||
sh %{git checkout master}
|
||||
sh %{git pull origin master}
|
||||
|
||||
if ENV["REF"] == "refs/heads/master"
|
||||
sh %{rake release_edge}
|
||||
elsif ENV["REF"] =~ %r{^refs/heads/(haml|sass)-pages$}
|
||||
sh %{rake pages PROJ=#{$1}}
|
||||
begin
|
||||
if ENV["REF"] == "refs/heads/master"
|
||||
sh %{rake release_edge}
|
||||
elsif ENV["REF"] =~ %r{^refs/heads/(haml|sass)-pages$}
|
||||
sh %{rake pages PROJ=#{$1}}
|
||||
end
|
||||
ensure
|
||||
sh %{git reset --hard HEAD}
|
||||
sh %{git clean -xdf}
|
||||
sh %{git checkout master}
|
||||
end
|
||||
|
||||
sh %{git reset --hard HEAD}
|
||||
sh %{git clean -xdf}
|
||||
sh %{git checkout master}
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue