[Openvpn-devel,2/3] travis-ci: change trusty image to xenial

Message ID 20190311133620.18278-3-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>

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>
---
 .travis.yml           | 9 ++-------
 .travis/build-deps.sh | 9 ---------
 2 files changed, 2 insertions(+), 16 deletions(-)

Comments

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

On 11-03-19 14:36, chipitsine@gmail.com wrote:
> From: Ilya Shipitsin <chipitsine@gmail.com>
> 
> 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>
> ---
>  .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
> 

Makes sense. (Too bad travis is so slow to roll out newer Ubuntu versions.)

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 4ca813798af89997441bc35723ed1995b6b269e1
Author: Ilya Shipitsin
Date:   Mon Mar 11 18:36:19 2019 +0500

     travis-ci: change trusty image to xenial

     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>


--
kind regards,

Gert Doering
Илья Шипицин March 18, 2019, 8:18 p.m. | #3
can we apply it to 2.4 as well ?
ubuntu trusty is EOL soon

вт, 19 мар. 2019 г. в 00:00, Gert Doering <gert@greenie.muc.de>:

> Your patch has been applied to the master branch.
>
> commit 4ca813798af89997441bc35723ed1995b6b269e1
> Author: Ilya Shipitsin
> Date:   Mon Mar 11 18:36:19 2019 +0500
>
>      travis-ci: change trusty image to xenial
>
>      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>
>
>
> --
> kind regards,
>
> Gert Doering
>
>
<div dir="ltr"><div>can we apply it to 2.4 as well ?</div><div>ubuntu trusty is EOL soon<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">вт, 19 мар. 2019 г. в 00:00, Gert Doering &lt;<a href="mailto:gert@greenie.muc.de">gert@greenie.muc.de</a>&gt;:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Your patch has been applied to the master branch.<br>
<br>
commit 4ca813798af89997441bc35723ed1995b6b269e1<br>
Author: Ilya Shipitsin<br>
Date:   Mon Mar 11 18:36:19 2019 +0500<br>
<br>
     travis-ci: change trusty image to xenial<br>
<br>
     Signed-off-by: Ilya Shipitsin &lt;<a href="mailto:chipitsine@gmail.com" target="_blank">chipitsine@gmail.com</a>&gt;<br>
     Acked-by: Steffan Karger &lt;<a href="mailto:steffan.karger@fox-it.com" target="_blank">steffan.karger@fox-it.com</a>&gt;<br>
     Message-Id: &lt;<a href="mailto:20190311133620.18278-3-chipitsine@gmail.com" target="_blank">20190311133620.18278-3-chipitsine@gmail.com</a>&gt;<br>
     URL: <a href="https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18270.html" rel="noreferrer" target="_blank">https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18270.html</a><br>
     Signed-off-by: Gert Doering &lt;<a href="mailto:gert@greenie.muc.de" target="_blank">gert@greenie.muc.de</a>&gt;<br>
<br>
<br>
--<br>
kind regards,<br>
<br>
Gert Doering<br>
<br>
</blockquote></div>
Gert Doering March 20, 2019, 11:40 a.m. | #4
Hi,

On Tue, Mar 19, 2019 at 01:18:37AM +0500, ???????? ?????????????? wrote:
> can we apply it to 2.4 as well ?
> ubuntu trusty is EOL soon

Steffan ACKed merging it into 2.4 as well.  For brevity I squashed the
three commits to the same file into one, which is appended below.

gert

Patch

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