From: DRC <information@libjpeg-turbo.org>
Date: Thu, 24 Nov 2016 00:44:33 +0000 (-0600)
Subject: Travis: Fix OS X build
X-Git-Tag: 1.5.90~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97205269bccd3f2ea51ec5ec11185869c608c52a;p=libjpeg-turbo

Travis: Fix OS X build

+ migrate to new xcode7.3 image, since xcode7.2 is going away soon.
---

diff --git a/.travis.yml b/.travis.yml
index 0021402..8f22389 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ matrix:
         - docker
     - os: osx
       env: BUILD_OFFICIAL=1
-      osx_image: xcode7.2
+      osx_image: xcode7.3
     - os: linux
       dist: trusty
       compiler: clang
@@ -40,6 +40,11 @@ matrix:
       env: CMAKE_FLAGS="-DWITH_SIMD=0"
 
 before_install:
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      brew install nasm homebrew/versions/gcc5 md5sha1sum Caskroom/versions/java6 gpg &&
+      git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor &&
+      ln -fs /Applications/Xcode.app /Applications/Xcode72.app;
+    fi
   - if [ "${BUILD_OFFICIAL:-}" != "" ]; then
       if [ "$TRAVIS_OS_NAME" = "linux" ]; then
         docker pull dcommander/buildljt;
@@ -52,11 +57,6 @@ before_install:
       gpg --import ci/sign_ljt &&
       rm ci/sign_ljt;
     fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      brew install nasm homebrew/versions/gcc5 md5sha1sum Caskroom/versions/java6 &&
-      git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor &&
-      ln -fs /Applications/Xcode.app /Applications/Xcode72.app;
-    fi
 
 script:
   - if [ "${BUILD_OFFICIAL:-}" != "" ]; then