Fix up some update-watcher stuff.
This commit is contained in:
parent
242aee3746
commit
5709b7082a
13
Rakefile
13
Rakefile
|
@ -250,6 +250,12 @@ end
|
||||||
# ----- Handling Updates -----
|
# ----- Handling Updates -----
|
||||||
|
|
||||||
task :handle_update do
|
task :handle_update do
|
||||||
|
unless ENV["REF"] =~ %r{^refs/heads/(master|(?:haml|sass)-pages)$}
|
||||||
|
puts "#{'=' * 20} Ignoring rake handle_update REF=#{ENV["REF"].inspect}"
|
||||||
|
next
|
||||||
|
end
|
||||||
|
branch = $1
|
||||||
|
|
||||||
puts
|
puts
|
||||||
puts
|
puts
|
||||||
puts '=' * 150
|
puts '=' * 150
|
||||||
|
@ -260,11 +266,11 @@ task :handle_update do
|
||||||
sh %{git reset --hard origin/master}
|
sh %{git reset --hard origin/master}
|
||||||
|
|
||||||
begin
|
begin
|
||||||
if ENV["REF"] == "refs/heads/master"
|
if branch == "master"
|
||||||
sh %{rake release_edge --trace}
|
sh %{rake release_edge --trace}
|
||||||
sh %{rake pages --trace PROJ=haml}
|
sh %{rake pages --trace PROJ=haml}
|
||||||
sh %{rake pages --trace PROJ=sass}
|
sh %{rake pages --trace PROJ=sass}
|
||||||
elsif ENV["REF"] =~ %r{^refs/heads/(haml|sass)-pages$}
|
elsif branch =~ /^(haml|sass)-pages$/
|
||||||
sh %{rake pages --trace PROJ=#{$1}}
|
sh %{rake pages --trace PROJ=#{$1}}
|
||||||
end
|
end
|
||||||
ensure
|
ensure
|
||||||
|
@ -272,4 +278,7 @@ task :handle_update do
|
||||||
sh %{git clean -xdf}
|
sh %{git clean -xdf}
|
||||||
sh %{git checkout master}
|
sh %{git checkout master}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
puts 'Done running handle_update'
|
||||||
|
puts '=' * 150
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,8 +3,11 @@ require 'sinatra'
|
||||||
require 'json'
|
require 'json'
|
||||||
set :port, 3123
|
set :port, 3123
|
||||||
set :environment, :production
|
set :environment, :production
|
||||||
|
enable :lock
|
||||||
Dir.chdir(File.dirname(__FILE__) + "/..")
|
Dir.chdir(File.dirname(__FILE__) + "/..")
|
||||||
|
|
||||||
post "/" do
|
post "/" do
|
||||||
|
puts "Recieved payload!"
|
||||||
|
puts "Rev: #{`git name-rev HEAD`.strip}"
|
||||||
system %{rake handle_update --trace REF=#{JSON.parse(params["payload"])["ref"].inspect}}
|
system %{rake handle_update --trace REF=#{JSON.parse(params["payload"])["ref"].inspect}}
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue