From 5fb634a184522e642606f6bcb66ef76ee1685293 Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Mon, 29 Aug 2016 18:55:41 +0200 Subject: [PATCH 1/2] Enable travis osx build with default configuration --- .travis.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1aac15138858..a8d8e79a986c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,14 @@ language: java -jdk: -- oraclejdk8 -- oraclejdk7 -- openjdk7 +matrix: + include: + - os: linux + jdk: oraclejdk8 + - os: linux + jdk: oraclejdk7 + - os: linux + jdk: openjdk7 + - os: osx + language: java before_install: - mvn clean - git clone -b travis `git config --get remote.origin.url` target/travis From 8622a3519bf9e6f852d40df6805edbc935f95909 Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Mon, 29 Aug 2016 19:56:12 +0200 Subject: [PATCH 2/2] Set JAVA_HOME by hand for osx builds --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a8d8e79a986c..2093581ee6db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,8 @@ matrix: - os: linux jdk: openjdk7 - os: osx - language: java + # see travis issue https://github.com/travis-ci/travis-ci/issues/2839 + env: JAVA_HOME=$(/usr/libexec/java_home) before_install: - mvn clean - git clone -b travis `git config --get remote.origin.url` target/travis