From patchwork Mon Mar 11 13:36:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Openvpn-devel,2/3] travis-ci: change trusty image to xenial X-Patchwork-Submitter: =?utf-8?b?0JjQu9GM0Y8g0KjQuNC/0LjRhtC40L0=?= X-Patchwork-Id: 700 Message-Id: <20190311133620.18278-3-chipitsine@gmail.com> To: openvpn-devel@lists.sourceforge.net Date: Mon, 11 Mar 2019 18:36:19 +0500 From: chipitsine@gmail.com List-Id: From: Ilya Shipitsin 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 --- .travis.yml | 9 ++------- .travis/build-deps.sh | 9 --------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 428131ec..bf46b14c 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 96a030cc..391b35ef 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