From: Ilya Shipitsin Date: Mon, 11 Mar 2019 13:36:20 +0000 (+0500) Subject: travis-ci: update osx to xcode9.4 and modernize brew management X-Git-Tag: v2.5_beta1~329 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cae16aae55dd1ef2ae41c36bec752db34ab4695;p=thirdparty%2Fopenvpn.git travis-ci: update osx to xcode9.4 and modernize brew management 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 Acked-by: Steffan Karger Message-Id: <20190311133620.18278-4-chipitsine@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18269.html Signed-off-by: Gert Doering --- diff --git a/.travis.yml b/.travis.yml index bf46b14ca..e61a8d382 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -76,6 +74,8 @@ addons: apt: update: true packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64] + homebrew: + packages: [ lzo ] cache: directories: @@ -83,10 +83,6 @@ 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)