Skip to content

Commit

Permalink
travis-ci: update osx to xcode9.4 and modernize brew management
Browse files Browse the repository at this point in the history
osx image used for builds, i.e. xcode7.3 is outdated, we
can switch to "default" xcode9.4 and use more fast brew
travis-ci plugin

Signed-off-by: Ilya Shipitsin <[email protected]>
Acked-by: Steffan Karger <[email protected]>
Message-Id: <[email protected]>
URL: https://www.mail-archive.com/[email protected]/msg18269.html
Signed-off-by: Gert Doering <[email protected]>
  • Loading branch information
chipitsine authored and cron2 committed Mar 18, 2019
1 parent 4ca8137 commit 2cae16a
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,9 @@ matrix:
compiler: clang
- env: SSLLIB="openssl"
os: osx
osx_image: xcode7.3
compiler: clang
- env: SSLLIB="mbedtls"
os: osx
osx_image: xcode7.3
compiler: clang
- env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u"
os: linux
Expand All @@ -76,17 +74,15 @@ addons:
apt:
update: true
packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64]
homebrew:
packages: [ lzo ]

cache:
directories:
- download-cache
- ${HOME}/opt
- ${HOME}/Library/Caches/Homebrew

before_install:
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update ; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install lzo; fi

install:
- if [ ! -z "${CHOST}" ]; then unset CC; fi
- .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1)
Expand Down

0 comments on commit 2cae16a

Please sign in to comment.