Skip to content

Commit

Permalink
travis-ci: change trusty image to xenial
Browse files Browse the repository at this point in the history
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 <chipitsine@gmail.com>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
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 <gert@greenie.muc.de>
  • Loading branch information
chipitsine authored and cron2 committed Mar 18, 2019
1 parent 27fb43d commit 4ca8137
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sudo: required
dist: trusty
dist: xenial

os: linux

Expand Down Expand Up @@ -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:
Expand Down
9 changes: 0 additions & 9 deletions .travis/build-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4ca8137

Please sign in to comment.