Skip to contentSkip to conversation

modernize travis-ci builds

Openvpn-devel In review [email protected]... 3 participants 12 messages Mar 11, 2019 – Mar 20, 2019

lore
Share & tools
lore
#0 lore raw

Ubuntu Trusty reaches EOL soon, so it is good time to upgrade travis-ci machinery to use Xenial image.

Also, some improvements are made in Linux and OSX builds.

#1 lore raw

PATCH 1/3 travis-ci: add "linux-ppc64le" to build matrix

From: Ilya Shipitsin <[email protected]...>

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)
.travis.yml +3 -0
index ede2aaa6..428131ec 100644
@@ -33,6 +33,9 @@ matrix:
     - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
       os: linux
       compiler: gcc
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h" LABEL="linux-ppc64le"
+      os: linux-ppc64le
+      compiler: gcc
     - env: SSLLIB="openssl" CFLAGS="-fsanitize=address"
       os: linux
       compiler: clang
Signature · 1 line
2.20.1
Acked-by on v1 1/3
#2 lore raw

Re: [Openvpn-devel] [PATCH 1/3] travis-ci: add "linux-ppc64le" to build matrix

Hi,

Quoted 13 lines · On 11-03-19 14:36, [email protected]... wrote:

From: Ilya Shipitsin <[email protected]...>

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)
.travis.yml +0 -0
index ede2aaa6..428131ec 100644

.travis.yml matrix: · line 41

Quoted 9 lines
.travis.yml +3 -0
@@ -33,6 +33,9 @@ matrix:
     - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
       os: linux
       compiler: gcc
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h" LABEL="linux-ppc64le"
+      os: linux-ppc64le
+      compiler: gcc
     - env: SSLLIB="openssl" CFLAGS="-fsanitize=address"
       os: linux
       compiler: clang

Looks good to me and passes tests on travis.

-Steffan

#3 lore raw

[Openvpn-devel] [PATCH applied] Re: travis-ci: add linux-ppc64le to build matrix

In reply to [email protected]...

Your patch has been applied to the master branch.

commit 27fb43da6f86eda7a6e5a033e060cab5be0cdbe9

Author: Ilya Shipitsin
Date:   Mon Mar 11 18:36:18 2019 +0500
     travis-ci: add linux-ppc64le to build matrix

     Signed-off-by: Ilya Shipitsin <[email protected]...>
     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg18271.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#4 lore raw

PATCH 2/3 travis-ci: change trusty image to xenial

In reply to [email protected]...

From: Ilya Shipitsin <[email protected]...>

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

---
 .travis.yml           | 9 ++-------
 .travis/build-deps.sh | 9 ---------
 2 files changed, 2 insertions(+), 16 deletions(-)
.travis.yml +2 -7
index 428131ec..bf46b14c 100644
@@ -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:
.travis/build-deps.sh +0 -9
index 96a030cc..391b35ef 100755
@@ -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
Signature · 1 line
2.20.1
Acked-by on v1 2/3
#5 lore raw

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

Hi,

Quoted 48 lines · On 11-03-19 14:36, [email protected]... wrote:

From: Ilya Shipitsin <[email protected]...>

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

---
 .travis.yml           | 9 ++-------
 .travis/build-deps.sh | 9 ---------
 2 files changed, 2 insertions(+), 16 deletions(-)
.travis.yml +2 -7
index 428131ec..bf46b14c 100644
@@ -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:
.travis/build-deps.sh +0 -2
index 96a030cc..391b35ef 100755
@@ -130,15 +130,6 @@ build_openssl () {
     fi
 }
 
-if [ ! -z ${CHOST+x} ]; then
-      #

.travis/build-deps.sh build_openssl () { · line 135

Quoted 10 lines
.travis/build-deps.sh +0 -7
-      # 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.)

-Steffan

#6 lore raw

[Openvpn-devel] [PATCH applied] Re: travis-ci: change trusty image to xenial

In reply to [email protected]...

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 <[email protected]...>
     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg18270.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#7 lore raw

Re: [Openvpn-devel] [PATCH applied] Re: travis-ci: change trusty image to xenial

can we apply it to 2.4 as well ?
ubuntu trusty is EOL soon

вт, 19 мар. 2019 г. в 00:00, Gert Doering <[email protected]...>:

Quoted 22 lines

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 <[email protected]...>
     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL:
https://www.mail-archive.com/[email protected]/msg18270.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

Acked-by Steffan Karger Acked-by Steffan Karger Acked-by Steffan Karger
#8 lore raw

Re: [Openvpn-devel] [PATCH applied] Re: travis-ci: change trusty image to xenial

Hi,

Quoted 2 lines · ???????? ??????????????

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

Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you 
 feed honest figures into a computer, honest figures come out. Never doubted 
 it myself till I met a computer with a sense of humor."
                             Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany                             [email protected]...

From 6a5c9bb146061e3331a9000405c84150c8bad310 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <[email protected]...>
Date: Mon, 11 Mar 2019 18:36:18 +0500
Subject: [PATCH] travis-ci: add "linux-ppc64le" to build matrix, change trusty
image to xenial, update osx to xcode9.4 and modernize brew management

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg18271.html

(cherry picked from commit 27fb43da6f86eda7a6e5a033e060cab5be0cdbe9)

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

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg18270.html

(cherry picked from commit 4ca813798af89997441bc35723ed1995b6b269e1)

osx image used for builds, i.e. xcode7.3 is outdated, we can switch to "default" xcode9.4 and use more fast brew travis-ci plugin

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg18269.html

(cherry picked from commit 2cae16aae55dd1ef2ae41c36bec752db34ab4695)
---
 .travis.yml           | 21 ++++++++-------------
 .travis/build-deps.sh |  9 ---------
 2 files changed, 8 insertions(+), 22 deletions(-)
.travis.yml +8 -13
index 62587d28..d7aff06e 100644
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 
 os: linux
 
@@ -33,6 +33,9 @@ matrix:
     - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
       os: linux
       compiler: gcc
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h" LABEL="linux-ppc64le"
+      os: linux-ppc64le
+      compiler: gcc
     - env: SSLLIB="openssl" CFLAGS="-fsanitize=address"
       os: linux
       compiler: clang
@@ -47,11 +50,9 @@ matrix:
       compiler: clang
     - env: SSLLIB="openssl"
       os: osx
-      osx_image: xcode7.3
       compiler: clang
     - env: SSLLIB="mbedtls"
       os: osx
-      osx_image: xcode7.3
       compiler: clang
     - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u"
       os: linux
@@ -76,12 +77,10 @@ matrix:
 
 addons:
   apt:
-    packages:
-      - liblzo2-dev
-      - libpam0g-dev
-      - liblz4-dev
-      - linux-libc-dev
-      - man2html
+    update: true
+    packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64]
+  homebrew:
+    packages: [ lzo ]
 
 cache:
   directories:
@@ -89,10 +88,6 @@ cache:
   - ${HOME}/opt
   - ${HOME}/Library/Caches/Homebrew
 
-before_install:
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update     ; fi
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install lzo; fi
-
 install:
   - if [ ! -z "${CHOST}" ]; then unset CC; fi
   - .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1)
.travis/build-deps.sh +0 -9
index 96a030cc..391b35ef 100755
@@ -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
Signature · 1 line
2.18.0
#9 lore raw

PATCH 3/3 travis-ci: update osx to xcode9.4 and modernize brew management

In reply to [email protected]...

From: Ilya Shipitsin <[email protected]...>

osx image used for builds, i.e. xcode7.3 is outdated, we can switch to "default" xcode9.4 and use more fast brew travis-ci plugin

---
 .travis.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
.travis.yml +2 -6
index bf46b14c..e61a8d38 100644
@@ -50,11 +50,9 @@ matrix:
       compiler: clang
     - env: SSLLIB="openssl"
       os: osx
-      osx_image: xcode7.3
       compiler: clang
     - env: SSLLIB="mbedtls"
       os: osx
-      osx_image: xcode7.3
       compiler: clang
     - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u"
       os: linux
@@ -76,6 +74,8 @@ addons:
   apt:
     update: true
     packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64]
+  homebrew:
+    packages: [ lzo ]
 
 cache:
   directories:
@@ -83,10 +83,6 @@ cache:
   - ${HOME}/opt
   - ${HOME}/Library/Caches/Homebrew
 
-before_install:
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update     ; fi
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install lzo; fi
-
 install:
   - if [ ! -z "${CHOST}" ]; then unset CC; fi
   - .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1)
Signature · 1 line
2.20.1
Acked-by on v1 3/3
#10 lore raw

Re: [Openvpn-devel] [PATCH 3/3] travis-ci: update osx to xcode9.4 and modernize brew management

Hi,

Quoted 38 lines · On 11-03-19 14:36, [email protected]... wrote:

From: Ilya Shipitsin <[email protected]...>

osx image used for builds, i.e. xcode7.3 is outdated, we can switch to "default" xcode9.4 and use more fast brew travis-ci plugin

---
 .travis.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
.travis.yml +2 -2
index bf46b14c..e61a8d38 100644
@@ -50,11 +50,9 @@ matrix:
       compiler: clang
     - env: SSLLIB="openssl"
       os: osx
-      osx_image: xcode7.3
       compiler: clang
     - env: SSLLIB="mbedtls"
       os: osx
-      osx_image: xcode7.3
       compiler: clang
     - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u"
       os: linux
@@ -76,6 +74,8 @@ addons:
   apt:
     update: true
     packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64]
+  homebrew:
+    packages: [ lzo ]
 
 cache:
   directories:

.travis.yml cache: · line 88

Quoted 10 lines
.travis.yml +0 -4
@@ -83,10 +83,6 @@ cache:
   - ${HOME}/opt
   - ${HOME}/Library/Caches/Homebrew
 
-before_install:
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update     ; fi
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install lzo; fi
-
 install:
   - if [ ! -z "${CHOST}" ]; then unset CC; fi
   - .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1)

Nice. Thanks for the updates.

-Steffan

#11 lore raw

[Openvpn-devel] [PATCH applied] Re: travis-ci: update osx to xcode9.4 and modernize brew management

In reply to [email protected]...

Your patch has been applied to the master branch.

commit 2cae16aae55dd1ef2ae41c36bec752db34ab4695

Author: Ilya Shipitsin
Date:   Mon Mar 11 18:36:20 2019 +0500
     travis-ci: update osx to xcode9.4 and modernize brew management

     Signed-off-by: Ilya Shipitsin <[email protected]...>
     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg18269.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering