From a216252fe0ddb817f0ee170e17f6975502172d05 Mon Sep 17 00:00:00 2001
From: Jonne Hass <mrzyx@mrzyx.de>
Date: Mon, 7 Nov 2011 01:38:22 +0100
Subject: [PATCH] we cause too much load on travis: if you have a fork and use
travis please turn it off; run oauth-cucumber inside other build to reduce
builds and save (setup) time.
---
.travis.yml | 2 --
lib/tasks/ci.rake | 7 +++----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index da3d395bf3..c7d3ee080c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,8 @@ rvm:
env:
- DB=postgres BUILD_TYPE=cucumber
- - DB=postgres BUILD_TYPE=oauth-cucumber
- DB=postgres BUILD_TYPE=other
- DB=mysql BUILD_TYPE=cucumber
- - DB=mysql BUILD_TYPE=oauth-cucumber
- DB=mysql BUILD_TYPE=other
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index dc7d93ca41..443703fa2a 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -6,16 +6,15 @@ namespace :ci do
puts "Running cucumber features..."
system("export DISPLAY=:99.0 && bundle exec rake cucumber")
raise "Cucumber failed!" unless $?.exitstatus == 0
- elsif ENV['BUILD_TYPE'] == 'oauth-cucumber'
- puts "Running oauth cucumber features..."
- system("export DISPLAY=:99.0 && GROUP=oauth bundle exec rake cucumber")
- raise "OAuth cucumber failed!" unless $?.exitstatus == 0
else
["rspec spec", "rake jasmine:ci"].each do |cmd|
puts "Starting to run #{cmd}..."
system("export DISPLAY=:99.0 && bundle exec #{cmd}")
raise "#{cmd} failed!" unless $?.exitstatus == 0
end
+ puts "Running oauth cucumber features..."
+ system("export DISPLAY=:99.0 && GROUP=oauth bundle exec rake cucumber")
+ raise "OAuth cucumber failed!" unless $?.exitstatus == 0
end
end
--
GitLab