From 4ca813798af89997441bc35723ed1995b6b269e1 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Mon, 11 Mar 2019 18:36:19 +0500 Subject: [PATCH] travis-ci: change trusty image to xenial Ubuntu Trusty reaches End of Life on April 30, 2019 Let us switch to xenial. Also, it simplifies mingw builds. We do not need to add xenial mingw manually anymore Signed-off-by: Ilya Shipitsin Acked-by: Steffan Karger Message-Id: <20190311133620.18278-3-chipitsine@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18270.html Signed-off-by: Gert Doering --- .travis.yml | 9 ++------- .travis/build-deps.sh | 9 --------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 428131ec1d4..bf46b14ca72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: required -dist: trusty +dist: xenial os: linux @@ -75,12 +75,7 @@ matrix: addons: apt: update: true - packages: - - liblzo2-dev - - libpam0g-dev - - liblz4-dev - - linux-libc-dev - - man2html + packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64] cache: directories: diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh index 96a030cc656..391b35ef7bc 100755 --- a/.travis/build-deps.sh +++ b/.travis/build-deps.sh @@ -130,15 +130,6 @@ build_openssl () { fi } -if [ ! -z ${CHOST+x} ]; then - # - # openvpn requires at least mingw-gcc-4.9, which is available at xenial repo - # - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu xenial main universe" - sudo apt-get update - sudo apt-get -y install dpkg mingw-w64 -fi - # Download and build crypto lib if [ "${SSLLIB}" = "openssl" ]; then download_openssl