From d4a1d0fbd00e0165cd365f822213081077e0ad27 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Tue, 6 Feb 2018 23:46:53 +0100 Subject: [PATCH] .travis.yml: remove xcode8.2 builds, group osx, add alias pip=pip2 --- .travis.yml | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1fb2c49..788885a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,6 @@ matrix: - python: 2.7 os: linux compiler: gcc - - language: C - os: osx - osx_image: xcode8 - compiler: clang - python: 3.5 os: linux compiler: gcc @@ -29,37 +25,21 @@ matrix: env: CFLAGS="`dpkg-buildflags --get CFLAGS`" LDFLAGS="`dpkg-buildflags --get LDFLAGS`" - language: C os: osx - osx_image: xcode8 - compiler: clang - env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate" - - language: C - os: osx - osx_image: xcode8 - compiler: clang - env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile" - - language: C - os: osx - osx_image: xcode8 compiler: clang - env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1 - language: C os: osx - osx_image: xcode8 compiler: clang - env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1 + env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate" - language: C os: osx - osx_image: xcode8.2 compiler: clang env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile" - language: C os: osx - osx_image: xcode8.2 compiler: clang env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1 - language: C os: osx - osx_image: xcode8.2 compiler: clang env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1 @@ -95,6 +75,10 @@ before_install: fi; install: + - | + if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + alias pip=pip2 + fi; - travis_retry pip install --upgrade pip - travis_retry make getwaf expandwaf deps_python - which pip -- 2.11.0