Merge pull request #715 from larsrh/topic/osx-take2

Travis: build on OS X (take 2)
sbt · Dec 13, 2015 · 7c2b66e · 7c2b66e
2 parents 57c938d + 2ce78fa
commit 7c2b66e
Show file tree

Hide file tree

Showing 2 changed files with 566 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,20 +1,32 @@
-language: scala
+language: java
 os:
-  - linux
+  - osx
+env:
+  - SCALA_VERSION=2.10.5
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then
+      brew update;
+      brew install xz;
+    fi
 script:
-  - sbt ++$TRAVIS_SCALA_VERSION --warn update compile test:compile && sbt ++$TRAVIS_SCALA_VERSION test "scripted rpm/* debian/* universal/* jar/*"
-scala:
-  - 2.10.5
-jdk:
-  - openjdk7
-  - oraclejdk8
+  - ./sbt ++$SCALA_VERSION --warn update compile test:compile
+  - ./sbt ++$SCALA_VERSION test "scripted universal/* jar/*"
+  - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
+      ./sbt ++$SCALA_VERSION "scripted rpm/* debian/*";
+    fi
 notifications:
   email:
     - qbranch@typesafe.com
 addons:
   apt:
     packages:
     - rpm
+matrix:
+  include:
+    - os: linux
+      jdk: openjdk7
+    - os: linux
+      jdk: oraclejdk8
 
 sudo: false
 cache: