Re: [PATCH] enable prometheus exporter in GH actions, adjust SSL matrix. cleanup travis-ci builds
On Fri, Nov 20, 2020 at 05:56:38PM +0100, Tim Düsterhus wrote: > Willy, > > Am 20.11.20 um 10:44 schrieb ???: > > here they are > > These patches are good now, please take them. Now merged, thank you! Willy
Re: [PATCH] enable prometheus exporter in GH actions, adjust SSL matrix. cleanup travis-ci builds
Willy, Am 20.11.20 um 10:44 schrieb Илья Шипицин: > here they are These patches are good now, please take them. > пт, 20 нояб. 2020 г. в 01:08, Tim Düsterhus : > >> Ilya, >> >> Am 19.11.20 um 21:00 schrieb Илья Шипицин: >>> next CI additions. >>> >> >> Thanks, the results of the changes look good to me. >> >> Can you please split the first patch into 2 or 3 different patches, >> though? It makes the commit history a bit cleaner and if they are all >> pushed together it will be effectively the same from resource usage. >> >> I'm thinking about: >> >> Patch 1. Add Prometheus. >> Patch 2. Remove LibreSSL 3.0.2. >> Patch 3. Add BoringSSL. Best regards Tim Düsterhus
Re: [PATCH] enable prometheus exporter in GH actions, adjust SSL matrix. cleanup travis-ci builds
here they are пт, 20 нояб. 2020 г. в 01:08, Tim Düsterhus : > Ilya, > > Am 19.11.20 um 21:00 schrieb Илья Шипицин: > > next CI additions. > > > > Thanks, the results of the changes look good to me. > > Can you please split the first patch into 2 or 3 different patches, > though? It makes the commit history a bit cleaner and if they are all > pushed together it will be effectively the same from resource usage. > > I'm thinking about: > > Patch 1. Add Prometheus. > Patch 2. Remove LibreSSL 3.0.2. > Patch 3. Add BoringSSL. > > Best regards > Tim Düsterhus > From 44d5498cf201ecebc5e2a0c47ae8b529dfa5fa19 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Fri, 20 Nov 2020 14:43:57 +0500 Subject: [PATCH 4/4] 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 76dce92d56174fb3222ea85c34df2b97e5eb0059 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Fri, 20 Nov 2020 14:43:23 +0500 Subject: [PATCH 3/4] CI: Github Actions: enable BoringSSL builds --- .github/matrix.py | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/matrix.py b/.github/matrix.py index 0576a62ff..c08f85040 100644 --- a/.github/matrix.py +++ b/.github/matrix.py @@ -97,6 +97,7 @@ for CC in ["gcc", "clang"]: "OPENSSL_VERSION=1.0.2u", "LIBRESSL_VERSION=2.9.2", "LIBRESSL_VERSION=3.1.1", +"BORINGSSL=yes", ]: flags = ["USE_OPENSSL=1"] if ssl != "stock": -- 2.28.0 From 50744236e486dbc231068d4375b1c4500cc86118 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Fri, 20 Nov 2020 14:42:27 +0500 Subject: [PATCH 2/4] CI: Github Actions: remove LibreSSL-3.0.2 builds --- .github/matrix.py | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/matrix.py b/.github/matrix.py index d3256561f..0576a62ff 100644 --- a/.github/matrix.py +++ b/.github/matrix.py @@ -96,7 +96,6 @@ 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", ]: flags = ["USE_OPENSSL=1"] -- 2.28.0 From 460f282ed71f3a30395b40b1969ccfdf893147a8 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Fri, 20 Nov 2020 14:41:40 +0500 Subject: [PATCH 1/4] CI: Github Actions: enable prometheus exporter --- .github/matrix.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/matrix.py b/.github/matrix.py index 6e5b9247e..d3256561f 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", ], @@ -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
Re: [PATCH] enable prometheus exporter in GH actions, adjust SSL matrix. cleanup travis-ci builds
Ilya, Am 19.11.20 um 21:00 schrieb Илья Шипицин: > next CI additions. > Thanks, the results of the changes look good to me. Can you please split the first patch into 2 or 3 different patches, though? It makes the commit history a bit cleaner and if they are all pushed together it will be effectively the same from resource usage. I'm thinking about: Patch 1. Add Prometheus. Patch 2. Remove LibreSSL 3.0.2. Patch 3. Add BoringSSL. Best regards Tim Düsterhus
[PATCH] enable prometheus exporter in GH actions, adjust SSL matrix. cleanup travis-ci builds
Hello, next CI additions. Ilya From bdb90411323c5d87dca8a10bc105ede3e46ab20e Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin 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 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
