Skip to content

Commit

Permalink
Update Travis OSX build to use newest image
Browse files Browse the repository at this point in the history
Java 8 is already installed in the newest image.

travis-ci/docs-travis-ci-com#593
travis-ci/travis-ci#2316
  • Loading branch information
JLLeitschuh committed Jun 21, 2016
1 parent c9438f1 commit 219ec8a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
9 changes: 2 additions & 7 deletions .travis-scripts/install.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
#!/bin/bash

if [[ $TRAVIS_OS_NAME == 'osx' ]]; then

# Install some custom requirements on OS X
wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/8u92-b14/jdk-8u92-macosx-x64.dmg
hdiutil mount jdk-8u92-macosx-x64.dmg
sudo installer -pkg /Volumes/JDK\ 8\ Update\ 92/JDK\ 8\ Update\ 92.pkg -target LocalSystem
else
if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
# Install some custom requirements on Linux if necessary
export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start
pip install --user codecov
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ matrix:
- os: linux
jdk: oraclejdk8
- os: osx
osx_image: xcode8

# GCC needs to be 4.8 or higher so that GOMP_4.0 is installed for opencv
# This is incredibly hard to track down, find the solution for and fix.
Expand Down

0 comments on commit 219ec8a

Please sign in to comment.