Browse code
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 <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>
Ilya Shipitsin authored on 2019/03/11 22:36:19Showing 2 changed files
| ... | ... |
@@ -1,5 +1,5 @@ |
| 1 | 1 |
sudo: required |
| 2 |
-dist: trusty |
|
| 2 |
+dist: xenial |
|
| 3 | 3 |
|
| 4 | 4 |
os: linux |
| 5 | 5 |
|
| ... | ... |
@@ -75,12 +75,7 @@ matrix: |
| 75 | 75 |
addons: |
| 76 | 76 |
apt: |
| 77 | 77 |
update: true |
| 78 |
- packages: |
|
| 79 |
- - liblzo2-dev |
|
| 80 |
- - libpam0g-dev |
|
| 81 |
- - liblz4-dev |
|
| 82 |
- - linux-libc-dev |
|
| 83 |
- - man2html |
|
| 78 |
+ packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64] |
|
| 84 | 79 |
|
| 85 | 80 |
cache: |
| 86 | 81 |
directories: |
| ... | ... |
@@ -130,15 +130,6 @@ build_openssl () {
|
| 130 | 130 |
fi |
| 131 | 131 |
} |
| 132 | 132 |
|
| 133 |
-if [ ! -z ${CHOST+x} ]; then
|
|
| 134 |
- # |
|
| 135 |
- # openvpn requires at least mingw-gcc-4.9, which is available at xenial repo |
|
| 136 |
- # |
|
| 137 |
- sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu xenial main universe" |
|
| 138 |
- sudo apt-get update |
|
| 139 |
- sudo apt-get -y install dpkg mingw-w64 |
|
| 140 |
-fi |
|
| 141 |
- |
|
| 142 | 133 |
# Download and build crypto lib |
| 143 | 134 |
if [ "${SSLLIB}" = "openssl" ]; then
|
| 144 | 135 |
download_openssl |