Skip to contentSkip to conversation

travis-ci: cleanup and upgrade ssl libraries

PATCH Superseded Ilya Shipitsin 2 participants 2 messages Apr 9, 2018 – May 13, 2018

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 travis-ci: cleanup and upgrade ssl libraries

both "compiler" and "exclude" are redundant, so remove them

---
 .travis.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
.travis.yml +4 -9
index 51645924..1cbd96bc 100644
@@ -5,9 +5,6 @@ os: linux
 
 language: c
 
-compiler:
-  - gcc
-
 env:
   global:
     - JOBS=3
@@ -15,10 +12,10 @@ env:
     - TAP_WINDOWS_VERSION=9.21.2
     - LZO_VERSION=2.10
     - PKCS11_HELPER_VERSION=1.22
-    - MBEDTLS_VERSION="2.5.1"
+    - MBEDTLS_VERSION="2.8.0"
     - MBEDTLS_CFLAGS="-I${PREFIX}/include"
     - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
-    - OPENSSL_VERSION="1.0.2l"
+    - OPENSSL_VERSION="1.0.2o"
     - OPENSSL_CFLAGS="-I${PREFIX}/include"
     - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto"
     # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
@@ -30,13 +27,13 @@ matrix:
     - env: SSLLIB="openssl" RUN_COVERITY="1"
       os: linux
       compiler: gcc
-    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
       os: linux
       compiler: gcc
     - env: SSLLIB="openssl" CFLAGS="-fsanitize=address"
       os: linux
       compiler: clang
-    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
       os: linux
       compiler: clang
     - env: SSLLIB="mbedtls"
@@ -65,8 +62,6 @@ matrix:
     - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small"
       os: linux
       compiler: clang
-  exclude:
-    - compiler: gcc
 
 addons:
   apt:
Signature · 1 line
2.14.3
#1 lore raw

Hi,

Quoted 1 line · Ilya Shipitsin

both "compiler" and "exclude" are redundant, so remove them

Makes sense. Though now that you're touching this anyway, maybe also add an OpenSSL 1.0.1 build? Since that's the oldest OpenSSL version we support in the master branch, that's an interesting version to test with CI.

-Steffan