Hello, next CI additions.
Ilya
From bdb90411323c5d87dca8a10bc105ede3e46ab20e Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin <[email protected]> Date: Fri, 20 Nov 2020 00:58:46 +0500 Subject: [PATCH 2/2] CI: travis-ci: remove builds migrated to GH actions --- .travis.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1057ccc37..bb0dfeb8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,32 +62,12 @@ matrix: 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: linux if: type == cron compiler: clang -- 2.28.0
From da22093905a66ec3720b67c3dc21760b72b94944 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin <[email protected]> Date: Fri, 20 Nov 2020 00:55:49 +0500 Subject: [PATCH 1/2] CI: Github Actions: enable prometheus exporter, adjust SSL variants Let us remove LibreSSL-3.0.2 (we do not need so many LibreSSL variants), enable BoringSSL --- .github/matrix.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/matrix.py b/.github/matrix.py index 6e5b9247e..c08f85040 100644 --- a/.github/matrix.py +++ b/.github/matrix.py @@ -72,6 +72,7 @@ for CC in ["gcc", "clang"]: "WURFL_LIB=contrib/wurfl", "USE_DEVICEATLAS=1", "DEVICEATLAS_SRC=contrib/deviceatlas", + "EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o", # "USE_51DEGREES=1", # "FIFTYONEDEGREES_SRC=contrib/51d/src/pattern", ], @@ -95,8 +96,8 @@ for CC in ["gcc", "clang"]: "stock", "OPENSSL_VERSION=1.0.2u", "LIBRESSL_VERSION=2.9.2", - "LIBRESSL_VERSION=3.0.2", "LIBRESSL_VERSION=3.1.1", + "BORINGSSL=yes", ]: flags = ["USE_OPENSSL=1"] if ssl != "stock": @@ -137,6 +138,7 @@ matrix.append( "WURFL_LIB=contrib/wurfl", "USE_DEVICEATLAS=1", "DEVICEATLAS_SRC=contrib/deviceatlas", + "EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o", # "USE_51DEGREES=1", # "FIFTYONEDEGREES_SRC=contrib/51d/src/pattern", ], -- 2.28.0
