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
This commit is contained in:
Ilya Shipitsin 2020-07-30 01:47:55 +05:00 committed by Willy Tarreau
parent 73b520b958
commit 90ff590962
1 changed files with 16 additions and 3 deletions

View File

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