From 5dce5b127240b2a8360d34d592c7a68ecd166cf2 Mon Sep 17 00:00:00 2001 From: Greg Cobb and JR Boyens Date: Thu, 18 Jul 2013 16:57:01 -0700 Subject: [PATCH] Try multi-language OS X build --- .travis.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c638d2de..718754b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,28 @@ -# before_script: +#before_script: # - "sh -e /etc/init.d/xvfb start" before_install: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - - "sh -e travis-chromium-script.sh" + #- "sh -e travis-chromium-script.sh" script: "DISPLAY=:99.0 bundle exec rake core_spec" +language: + - ruby + - objective-c + rvm: - "1.9.3" env: - JASMINE_BROWSER=firefox - - JASMINE_BROWSER=chrome + #- JASMINE_BROWSER=chrome - JASMINE_BROWSER=phantomjs + - JASMINE_BROWSER=safari + +matrix: + allow_failures: + #- env: JASMINE_BROWSER=chrome + - env: JASMINE_BROWSER=phantomjs + include: + - language: objective-c + env: JASMINE_BROWSER=safari