From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Mon, 6 May 2019 20:42:43 +0000 (+0500)
Subject: BUILD: travis-ci bugfixes and improvements
X-Git-Tag: v2.0-dev3~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8db4e6dba25438800f08b8cb6e8e14abdd1ce66;p=thirdparty%2Fhaproxy.git

BUILD: travis-ci bugfixes and improvements

Call missing scripts/build-ssl.sh (which actually builds SSL variants)
Enable OpenSSL, LibreSSL builds caching, it saves a bunch of time
LibreSSL builds are not allowed to fail anymore
Add openssl to osx builds
---

diff --git a/.travis.yml b/.travis.yml
index 87331fc2ce..f9a13586f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,11 @@ addons:
   apt:
     packages: [ liblua5.3-dev ]
 
+cache:
+  directories:
+  - download-cache
+  - ${HOME}/opt
+
 matrix:
   include:
   - os: linux
@@ -44,22 +49,13 @@ matrix:
     env: TARGET=linux2628 FLAGS=
   - os: osx
     compiler: clang
-    env: TARGET=generic FLAGS=
-  allow_failures:
-  - os: linux
-    compiler: gcc
-    env: TARGET=linux2628 LIBRESSL_VERSION=2.9.1
-  - os: linux
-    compiler: gcc
-    env: TARGET=linux2628 LIBRESSL_VERSION=2.8.3
-  - os: linux
-    compiler: gcc
-    env: TARGET=linux2628 LIBRESSL_VERSION=2.7.5
+    env: TARGET=generic FLAGS="USE_OPENSSL=1" OPENSSL_VERSION=1.1.1b
 
 install:
   - git clone https://github.com/VTest/VTest.git ../vtest
   # Special flags due to: https://github.com/vtest/VTest/issues/12
   - make -C ../vtest FLAGS="-O2 -s -Wall"
+  - scripts/build-ssl.sh > build-ssl.log 2>&1 || (cat build-ssl.log && exit 1)
 
 script:
   - make CC=$CC V=1 TARGET=$TARGET $FLAGS