Try multi-language OS X build

This commit is contained in:
Greg Cobb and JR Boyens
2013-07-18 16:57:01 -07:00
parent 7c17b06856
commit 5dce5b1272
+16 -3
View File
@@ -1,15 +1,28 @@
# before_script: #before_script:
# - "sh -e /etc/init.d/xvfb start" # - "sh -e /etc/init.d/xvfb start"
before_install: before_install:
- "export DISPLAY=:99.0" - "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start" - "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" script: "DISPLAY=:99.0 bundle exec rake core_spec"
language:
- ruby
- objective-c
rvm: rvm:
- "1.9.3" - "1.9.3"
env: env:
- JASMINE_BROWSER=firefox - JASMINE_BROWSER=firefox
- JASMINE_BROWSER=chrome #- JASMINE_BROWSER=chrome
- JASMINE_BROWSER=phantomjs - 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