summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2015-08-04 11:03:27 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2015-08-04 11:03:27 +0900
commit6f745e211fafeff06c6b5546863474d07f8635a8 (patch)
tree7ff6673f2c9d04ee0650437409742907608c141b
parent65066f1799f613066a046b2054ed177c51d999f7 (diff)
parentbfcc55fbf98665b33ca7110349aeb66d3ef0df1d (diff)
downloadmruby-6f745e211fafeff06c6b5546863474d07f8635a8.tar.gz
mruby-6f745e211fafeff06c6b5546863474d07f8635a8.zip
Merge pull request #2908 from BanzaiMan/ha-feature-containers
Add build on Trusty and OS X
-rw-r--r--.travis.yml11
1 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index f7be58c8a..bcfce3984 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,14 @@
-# no installation...
+language: c
+
+matrix:
+ include:
+ - os: linux
+ sudo: 9000
+ - os: osx
+ osx_image: xcod6.4
install:
- - sudo apt-get -q install gperf
+ - if [ $TRAVIS_OS_NAME = 'linux' ]; then sudo apt-get update -qq; sudo apt-get -q install gperf; fi
env: MRUBY_CONFIG=travis_config.rb
script: "./minirake all test"