From 4af9d75783ee322265713d27dc9a7bb520deeabd Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Mar 2025 02:53:40 +0100 Subject: [PATCH] GHA/non-native: revert to bare builds for Android 21 vcpkg requires Android 28 by default after a recent update that's being deployed onto CI runs (with `libiconv:arm64-android@1.18#1`). Revert to bare, no-ssl, no-psl configuration for Android 21 jobs to make them work again. Bug: https://github.com/curl/curl/pull/16824#issuecomment-2750912507 Ref: https://github.com/microsoft/vcpkg/pull/44424#issuecomment-2753027630 Closes #16832 --- .github/workflows/non-native.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml index 3f028630fc..1a79828f27 100644 --- a/.github/workflows/non-native.yml +++ b/.github/workflows/non-native.yml @@ -404,11 +404,11 @@ jobs: strategy: matrix: include: - - { build: 'autotools', platform: '21', name: "openssl", install: 'brotli zstd libpsl nghttp2 openssl libssh2', - options: '--with-openssl --with-brotli' } + - { build: 'autotools', platform: '21', name: "!ssl !zstd", + options: '--without-ssl --without-libpsl --without-zstd' } - - { build: 'cmake' , platform: '21', name: "openssl", install: 'brotli zstd libpsl nghttp2 openssl libssh2', - options: '-DCURL_USE_OPENSSL=ON' } + - { build: 'cmake' , platform: '21', name: "!ssl !zstd", + options: '-DCURL_ENABLE_SSL=OFF -DCURL_USE_LIBPSL=OFF -DCURL_ZSTD=OFF' } - { build: 'autotools', platform: '35', name: "openssl", install: 'brotli zstd libpsl nghttp2 openssl libssh2', options: '--with-openssl --with-brotli' }