From 90ff590962914be4a14bb47685a3269e78861ba8 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Thu, 30 Jul 2020 01:47:55 +0500
Subject: [PATCH] CI: travis-ci : switch to stock openssl when openssl-1.1.1 is
 used

instead of building openssl-1.1.1 let us use stock package and save
some electricity
---
 .travis.yml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3ee52f613a..7ff0354721 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,56 +33,67 @@ matrix:
     if: type == cron
     compiler: gcc
     env: TARGET=linux-glibc OPENSSL_VERSION=1.0.2u
+    name: openssl-1.0.2
   - os: linux
     arch: amd64
     if: type == push
     compiler: clang
-    env: TARGET=linux-glibc OPENSSL_VERSION=1.1.1f CC=clang-9
+    env: TARGET=linux-glibc CC=clang-9
+    name: openssl-1.1.1
   - os: linux
     arch: arm64
     if: type == push
     compiler: clang
     env: TARGET=linux-glibc CC=clang-9
+    name: openssl-1.1.1
   - os: linux
     arch: s390x
     if: type == push
     compiler: gcc
-    env: TARGET=linux-glibc OPENSSL_VERSION=1.1.1f
+    env: TARGET=linux-glibc
+    name: openssl-1.1.1
   - os: linux
     if: type == cron
     compiler: clang
-    env: TARGET=linux-glibc OPENSSL_VERSION=1.1.1f COVERITY_SCAN_PROJECT_NAME="Haproxy" COVERITY_SCAN_BRANCH_PATTERN="*" COVERITY_SCAN_NOTIFICATION_EMAIL="chipitsine@gmail.com" COVERITY_SCAN_BUILD_COMMAND="make CC=clang TARGET=$TARGET $FLAGS 51DEGREES_SRC=$FIFTYONEDEGREES_SRC"
+    env: TARGET=linux-glibc COVERITY_SCAN_PROJECT_NAME="Haproxy" COVERITY_SCAN_BRANCH_PATTERN="*" COVERITY_SCAN_NOTIFICATION_EMAIL="chipitsine@gmail.com" COVERITY_SCAN_BUILD_COMMAND="make CC=clang TARGET=$TARGET $FLAGS 51DEGREES_SRC=$FIFTYONEDEGREES_SRC"
     script:
       - |
         if [ ! -z ${COVERITY_SCAN_TOKEN+x} ]; then
           make -C contrib/wurfl
           curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true
         fi
+    name: openssl-1.1.1
   - os: linux
     if: type == cron
     compiler: clang
     env: TARGET=linux-glibc OPENSSL_VERSION=1.1.0l FIFTYONEDEGREES_SRC="contrib/51d/src/trie" CC=clang-9
+    name: openssl-1.1.1 | 51d trie
   - os: linux
     if: type == push
     compiler: clang
     env: TARGET=linux-glibc LIBRESSL_VERSION=3.1.1 CC=clang-9
+    name: libressl-3.1.1
   - os: linux
     env: DEBUG_OPTIONS=""
     if: type == cron
     compiler: clang
     env: TARGET=linux-glibc LIBRESSL_VERSION=3.0.2 CC=clang-9
+    name: libressl-3.0.2 | ERR=
   - os: linux
     if: type == cron
     compiler: clang
     env: TARGET=linux-glibc LIBRESSL_VERSION=2.9.2 EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" CC=clang-9
+    name: libressl-2.9.2 | prometheus-exporter
   - os: linux
     if: type == cron
     compiler: clang
     env: TARGET=linux-glibc BORINGSSL=yes
+    name: boringssl
   - os: linux
     if: type == push
     compiler: clang
     env: TARGET=linux-glibc FLAGS= CC=clang-9
+    name: FLAGS=
   - os: osx
     osx_image: xcode12
     if: type == push
@@ -91,6 +102,7 @@ matrix:
       - echo 'brew "socat"' > brew.bundle
       - brew bundle --file=brew.bundle
     env: TARGET=osx FLAGS="USE_OPENSSL=1" OPENSSL_VERSION=1.1.1f
+    name: openssl-1.1.1
   - os: linux
     if: type == cron
     compiler: clang
@@ -98,6 +110,7 @@ matrix:
     before_script:
       - git clone https://github.com/wtarreau/libslz
       - cd libslz && make && make PREFIX=${HOME}/opt install && cd ..
+    name: openssl-1.1.1 | slz | pcre2
   allow_failures:
   - os: linux
     arch: arm64