diff --git a/ci.sh b/ci.sh index dfd5fc969..e6b395ace 100755 --- a/ci.sh +++ b/ci.sh @@ -16,4 +16,5 @@ rm -rf /usr/local/rvm/gems/ree-1.8.7-2010.02@diaspora/cache && rm -rf /usr/local/rvm/gems/ree-1.8.7-2010.02@global/cache && rm -rf /usr/local/rvm/gems/ree-1.8.7-2010.02/cache && bundle install && +cp config/application.yml.example config/application.yml && bundle exec rake cruise diff --git a/lib/cruise/build.rb b/lib/cruise/build.rb deleted file mode 100644 index ae9f6b425..000000000 --- a/lib/cruise/build.rb +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env ruby -require 'fileutils' -include FileUtils - -def root_dir - @root_dir ||= File.expand_path(File.dirname(__FILE__) + '/../..') -end - -def rake(*tasks) - tasks.each do |task| - return false unless system("rake", task, 'RAILS_ENV=test') - end -end - -build_results = {} - -cd root_dir do - build_results[:bundle] = system 'bundle install' # bundling here, rather than in a task (not in Rails context) - system "cp config/application.yml.example config/application.yml" - build_results[:spec] = rake 'cruise' -end - -failures = build_results.select { |key, value| value == false } - -if failures.empty? - exit(0) -else - exit(-1) -end