Make most things depend on bootstrap

Fixes #1940
This commit is contained in:
Jordan Sissel 2014-10-22 19:56:43 +00:00
parent 41b28ad228
commit f35558e395
2 changed files with 4 additions and 4 deletions

View file

@ -48,7 +48,7 @@ namespace "artifact" do
end
desc "Build a tar.gz of logstash with all dependencies"
task "tar" => ["vendor:elasticsearch", "vendor:collectd", "vendor:jruby", "vendor:gems"] do
task "tar" => ["bootstrap"] do
require "zlib"
require "archive/tar/minitar"
require "logstash/version"
@ -165,7 +165,7 @@ namespace "artifact" do
end # def package
desc "Build an RPM of logstash with all dependencies"
task "rpm" => ["vendor:elasticsearch", "vendor:collectd", "vendor:jruby", "vendor:gems"] do
task "rpm" => ["bootstrap"] do
package("centos", "5")
end

View file

@ -1,13 +1,13 @@
namespace "test" do
task "default" => [ "vendor:all" ] do
task "default" => [ "bootstrap" ] do
require "logstash/environment"
LogStash::Environment.set_gem_paths!
require 'rspec/core'
RSpec::Core::Runner.run(Rake::FileList["spec/**/*.rb"])
end
task "fail-fast" => [ "vendor:all" ] do
task "fail-fast" => [ "bootstrap" ] do
require "logstash/environment"
LogStash::Environment.set_gem_paths!
require 'rspec/core'