diff mbox series

[Openvpn-devel] travis-ci: cleanup and upgrade ssl libraries

Message ID 20180409091038.12348-1-chipitsine@gmail.com
State Superseded, archived
Headers
Series [Openvpn-devel] travis-ci: cleanup and upgrade ssl libraries |

Commit Message

Илья Шипицин April 8, 2018, 11:10 p.m. UTC 
  both "compiler" and "exclude" are redundant, so remove them

Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
---
 .travis.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Comments

Steffan Karger May 13, 2018, 8 a.m. UTC | #1 
Hi,

On 09-04-18 11:10, Ilya Shipitsin wrote:
> 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

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
diff mbox series

Patch

diff --git a/.travis.yml b/.travis.yml
index 51645924..1cbd96bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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: