From 7c039292ad955db327dce4e9e6a3f612ddef3c58 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 21 Jan 2025 01:05:56 +0100 Subject: [PATCH] GHA/non-native: fix TLS backend in Android job names Also drop whitespaces/alignment. Reported-by: Tal Regev Follow-up to 12a6de2f660dd692cce93cb65ce6e3ec126bb531 #16043 --- .github/workflows/non-native.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml index c1d8bf542b..5cbe12c7cc 100644 --- a/.github/workflows/non-native.yml +++ b/.github/workflows/non-native.yml @@ -381,22 +381,22 @@ jobs: strategy: matrix: include: - - { build: 'autotools', platform: '21', name: "libressl" , install: 'brotli zstd libpsl nghttp2 openssl libssh2', + - { build: 'autotools', platform: '21', name: "openssl", install: 'brotli zstd libpsl nghttp2 openssl libssh2', options: '--with-openssl --with-brotli' } - - { build: 'cmake' , platform: '21', name: "libressl" , install: 'brotli zstd libpsl nghttp2 openssl libssh2', + - { build: 'cmake' , platform: '21', name: "openssl", install: 'brotli zstd libpsl nghttp2 openssl libssh2', options: '-DCURL_USE_OPENSSL=ON' } - - { build: 'autotools', platform: '35', name: "libressl" , install: 'brotli zstd libpsl nghttp2 openssl libssh2', + - { build: 'autotools', platform: '35', name: "openssl", install: 'brotli zstd libpsl nghttp2 openssl libssh2', options: '--with-openssl --with-brotli' } - - { build: 'cmake' , platform: '35', name: "libressl" , install: 'brotli zstd libpsl nghttp2 openssl libssh2', + - { build: 'cmake' , platform: '35', name: "openssl", install: 'brotli zstd libpsl nghttp2 openssl libssh2', options: '-DCURL_USE_OPENSSL=ON' } # FIXME: Must disable zstd explicitly, otherwise cmake/pkg-config finds it in /usr/include # and the build fails. I had found no option to disable this behavior. Other default # dependencies not offered via vcpkg may also need this. - - { build: 'cmake' , platform: '35', name: "boringssl !zstd", install: ' libpsl boringssl', + - { build: 'cmake' , platform: '35', name: "boringssl !zstd", install: 'libpsl boringssl', options: '-DCURL_USE_OPENSSL=ON -DOPENSSL_USE_STATIC_LIBS=ON -DCURL_ZSTD=OFF' } fail-fast: false -- 2.47.3