Browse code
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 <chipitsine@gmail.com>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
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 <gert@greenie.muc.de>
Ilya Shipitsin authored on 2019/03/11 22:36:20Showing 1 changed files
| ... | ... |
@@ -50,11 +50,9 @@ matrix: |
| 50 | 50 |
compiler: clang |
| 51 | 51 |
- env: SSLLIB="openssl" |
| 52 | 52 |
os: osx |
| 53 |
- osx_image: xcode7.3 |
|
| 54 | 53 |
compiler: clang |
| 55 | 54 |
- env: SSLLIB="mbedtls" |
| 56 | 55 |
os: osx |
| 57 |
- osx_image: xcode7.3 |
|
| 58 | 56 |
compiler: clang |
| 59 | 57 |
- env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u" |
| 60 | 58 |
os: linux |
| ... | ... |
@@ -76,6 +74,8 @@ addons: |
| 76 | 76 |
apt: |
| 77 | 77 |
update: true |
| 78 | 78 |
packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64] |
| 79 |
+ homebrew: |
|
| 80 |
+ packages: [ lzo ] |
|
| 79 | 81 |
|
| 80 | 82 |
cache: |
| 81 | 83 |
directories: |
| ... | ... |
@@ -83,10 +83,6 @@ cache: |
| 83 | 83 |
- ${HOME}/opt
|
| 84 | 84 |
- ${HOME}/Library/Caches/Homebrew
|
| 85 | 85 |
|
| 86 |
-before_install: |
|
| 87 |
- - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update ; fi
|
|
| 88 |
- - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install lzo; fi
|
|
| 89 |
- |
|
| 90 | 86 |
install: |
| 91 | 87 |
- if [ ! -z "${CHOST}" ]; then unset CC; fi
|
| 92 | 88 |
- .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1) |