[Openvpn-devel,3/3] travis-ci: update osx to xcode9.4 and modernize brew management

Message ID 20190311133620.18278-4-chipitsine@gmail.com
State Accepted
Headers show
Series
  • [Openvpn-devel,1/3] travis-ci: add "linux-ppc64le" to build matrix
Related show

Commit Message

Илья Шипицин March 11, 2019, 1:36 p.m.
From: Ilya Shipitsin <chipitsine@gmail.com>

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>
---
 .travis.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Steffan Karger March 17, 2019, 8:55 a.m. | #1
Hi,

On 11-03-19 14:36, chipitsine@gmail.com wrote:
> From: Ilya Shipitsin <chipitsine@gmail.com>
> 
> 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>
> ---
>  .travis.yml | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index bf46b14c..e61a8d38 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)
> 

Nice. Thanks for the updates.

Acked-by: Steffan Karger <steffan@karger.me>

-Steffan
Gert Doering March 18, 2019, 7 p.m. | #2
Your patch has been applied to the master branch.

commit 2cae16aae55dd1ef2ae41c36bec752db34ab4695
Author: Ilya Shipitsin
Date:   Mon Mar 11 18:36:20 2019 +0500

     travis-ci: update osx to xcode9.4 and modernize brew management

     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>


--
kind regards,

Gert Doering

Patch

diff --git a/.travis.yml b/.travis.yml
index bf46b14c..e61a8d38 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)