Browse code

travis-ci: cleanup, refactor, upgrade ssl libraries

Both "compiler" and "exclude" are redundant, so remove them.
Add openssl-1.0.1u to build matrix. Enable explicit apt update
(it was disabled by default in travis-ci).

Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>

--
v2: Add openssl-1.0.1u to build matrix (thanks to Steffan Karger),
Add explicit apt-get update (it was disabled by default in travis-ci)
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <20180527190057.3488-1-chipitsine@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg16898.html

Signed-off-by: Gert Doering <gert@greenie.muc.de>

Ilya Shipitsin authored on 2018/05/28 04:00:57
Showing 1 changed files
... ...
@@ -5,9 +5,6 @@ os: linux
5 5
 
6 6
 language: c
7 7
 
8
-compiler:
9
-  - gcc
10
-
11 8
 env:
12 9
   global:
13 10
     - JOBS=3
... ...
@@ -15,10 +12,10 @@ env:
15 15
     - TAP_WINDOWS_VERSION=9.21.2
16 16
     - LZO_VERSION=2.10
17 17
     - PKCS11_HELPER_VERSION=1.22
18
-    - MBEDTLS_VERSION="2.5.1"
18
+    - MBEDTLS_VERSION="2.8.0"
19 19
     - MBEDTLS_CFLAGS="-I${PREFIX}/include"
20 20
     - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
21
-    - OPENSSL_VERSION="1.0.2l"
21
+    - OPENSSL_VERSION="1.0.2o"
22 22
     - OPENSSL_CFLAGS="-I${PREFIX}/include"
23 23
     - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto"
24 24
     # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
... ...
@@ -30,13 +27,16 @@ matrix:
30 30
     - env: SSLLIB="openssl" RUN_COVERITY="1"
31 31
       os: linux
32 32
       compiler: gcc
33
-    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
33
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u"
34
+      os: linux
35
+      compiler: gcc
36
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
34 37
       os: linux
35 38
       compiler: gcc
36 39
     - env: SSLLIB="openssl" CFLAGS="-fsanitize=address"
37 40
       os: linux
38 41
       compiler: clang
39
-    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
42
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
40 43
       os: linux
41 44
       compiler: clang
42 45
     - env: SSLLIB="mbedtls"
... ...
@@ -65,11 +65,10 @@ matrix:
65 65
     - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small"
66 66
       os: linux
67 67
       compiler: clang
68
-  exclude:
69
-    - compiler: gcc
70 68
 
71 69
 addons:
72 70
   apt:
71
+    update: true
73 72
     packages:
74 73
       - liblzo2-dev
75 74
       - libpam0g-dev