CI: realign cmake build settings (for nghttp2, libidn2)
- nghttp2 is now on by default, adjust build configuration accordingly. Follow-up to87aa4ebd82
#14136 - GHA/macos: disable libidn2 in combination builds, syncing with autotools. Otherwise it's now auto-detected via pkg-config by default. Follow-up tof43adc2c49
#14137 Closes #14364
This commit is contained in:
Родитель
8a3740bc8e
Коммит
fadb2ee6ec
|
@ -344,7 +344,6 @@ jobs:
|
||||||
cmake -B bld -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON \
|
cmake -B bld -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON \
|
||||||
-DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.build.macos-version-min }} \
|
-DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.build.macos-version-min }} \
|
||||||
"-DCMAKE_C_COMPILER_TARGET=$(uname -m | sed 's/arm64/aarch64/')-apple-darwin$(uname -r)" \
|
"-DCMAKE_C_COMPILER_TARGET=$(uname -m | sed 's/arm64/aarch64/')-apple-darwin$(uname -r)" \
|
||||||
-DUSE_NGHTTP2=ON \
|
|
||||||
${{ matrix.build.generate }}
|
${{ matrix.build.generate }}
|
||||||
|
|
||||||
- name: 'configure log'
|
- name: 'configure log'
|
||||||
|
@ -597,7 +596,7 @@ jobs:
|
||||||
"-DCMAKE_IGNORE_PREFIX_PATH=$(brew --prefix)" \
|
"-DCMAKE_IGNORE_PREFIX_PATH=$(brew --prefix)" \
|
||||||
"-DCMAKE_C_COMPILER_TARGET=$(uname -m | sed 's/arm64/aarch64/')-apple-darwin$(uname -r)" \
|
"-DCMAKE_C_COMPILER_TARGET=$(uname -m | sed 's/arm64/aarch64/')-apple-darwin$(uname -r)" \
|
||||||
-DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF \
|
-DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF \
|
||||||
-DUSE_APPLE_IDN=OFF \
|
-DUSE_NGHTTP2=OFF -DUSE_LIBIDN2=OFF -DUSE_APPLE_IDN=OFF \
|
||||||
${options}
|
${options}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,7 @@ jobs:
|
||||||
-DBUILD_EXAMPLES=ON \
|
-DBUILD_EXAMPLES=ON \
|
||||||
-DENABLE_WEBSOCKETS=ON \
|
-DENABLE_WEBSOCKETS=ON \
|
||||||
-DCURL_USE_OPENSSL=ON \
|
-DCURL_USE_OPENSSL=ON \
|
||||||
-DCURL_BROTLI=ON -DUSE_NGHTTP2=ON -DCURL_USE_GSSAPI=ON \
|
-DCURL_BROTLI=ON -DCURL_USE_GSSAPI=ON \
|
||||||
|| { cat bld/CMakeFiles/CMake*.yaml; false; }
|
|| { cat bld/CMakeFiles/CMake*.yaml; false; }
|
||||||
cmake --build bld --config Debug --parallel 3
|
cmake --build bld --config Debug --parallel 3
|
||||||
bld/src/curl --disable --version
|
bld/src/curl --disable --version
|
||||||
|
@ -98,7 +98,7 @@ jobs:
|
||||||
-DBUILD_EXAMPLES=ON \
|
-DBUILD_EXAMPLES=ON \
|
||||||
-DENABLE_WEBSOCKETS=ON \
|
-DENABLE_WEBSOCKETS=ON \
|
||||||
-DCURL_USE_OPENSSL=ON \
|
-DCURL_USE_OPENSSL=ON \
|
||||||
-DCURL_BROTLI=ON -DUSE_NGHTTP2=ON \
|
-DCURL_BROTLI=ON \
|
||||||
|| { cat bld/CMakeFiles/CMake*.yaml; false; }
|
|| { cat bld/CMakeFiles/CMake*.yaml; false; }
|
||||||
cmake --build bld --config Debug --parallel 3
|
cmake --build bld --config Debug --parallel 3
|
||||||
bld/src/curl --disable --version
|
bld/src/curl --disable --version
|
||||||
|
@ -167,7 +167,7 @@ jobs:
|
||||||
-DBUILD_EXAMPLES=ON \
|
-DBUILD_EXAMPLES=ON \
|
||||||
-DENABLE_WEBSOCKETS=ON \
|
-DENABLE_WEBSOCKETS=ON \
|
||||||
-DCURL_USE_OPENSSL=ON \
|
-DCURL_USE_OPENSSL=ON \
|
||||||
-DCURL_BROTLI=ON -DUSE_NGHTTP2=ON -DCURL_USE_GSSAPI=ON \
|
-DCURL_BROTLI=ON -DCURL_USE_GSSAPI=ON \
|
||||||
|| { cat bld/CMakeFiles/CMake*.yaml; false; }
|
|| { cat bld/CMakeFiles/CMake*.yaml; false; }
|
||||||
cmake --build bld --config Debug --parallel 3
|
cmake --build bld --config Debug --parallel 3
|
||||||
bld/src/curl --disable --version
|
bld/src/curl --disable --version
|
||||||
|
|
|
@ -136,7 +136,7 @@ jobs:
|
||||||
-DCURL_WERROR=ON \
|
-DCURL_WERROR=ON \
|
||||||
-DBUILD_EXAMPLES=ON \
|
-DBUILD_EXAMPLES=ON \
|
||||||
-DENABLE_WEBSOCKETS=ON \
|
-DENABLE_WEBSOCKETS=ON \
|
||||||
-DCURL_BROTLI=ON -DUSE_NGHTTP2=ON \
|
-DCURL_BROTLI=ON \
|
||||||
${{ matrix.config }}
|
${{ matrix.config }}
|
||||||
|
|
||||||
- name: 'cmake configure log'
|
- name: 'cmake configure log'
|
||||||
|
@ -316,7 +316,7 @@ jobs:
|
||||||
-DCURL_WERROR=ON \
|
-DCURL_WERROR=ON \
|
||||||
-DBUILD_EXAMPLES=ON \
|
-DBUILD_EXAMPLES=ON \
|
||||||
-DENABLE_WEBSOCKETS=ON \
|
-DENABLE_WEBSOCKETS=ON \
|
||||||
-DCURL_BROTLI=ON -DUSE_NGHTTP2=ON \
|
-DCURL_BROTLI=ON \
|
||||||
${{ matrix.config }}
|
${{ matrix.config }}
|
||||||
|
|
||||||
- name: 'cmake configure log'
|
- name: 'cmake configure log'
|
||||||
|
@ -498,35 +498,35 @@ jobs:
|
||||||
plat: 'windows'
|
plat: 'windows'
|
||||||
type: 'Debug'
|
type: 'Debug'
|
||||||
tflags: '~1516 ~2301 ~2302 ~2303 ~2307'
|
tflags: '~1516 ~2301 ~2302 ~2303 ~2307'
|
||||||
config: '-DENABLE_DEBUG=ON -DENABLE_UNICODE=ON -DCURL_USE_SCHANNEL=ON -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DCURL_USE_LIBPSL=ON -DUSE_NGHTTP2=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBSSH2=ON -DUSE_WIN32_IDN=ON -DCURL_USE_GSASL=ON -DCURL_USE_OPENSSL=ON -DCURL_DEFAULT_SSL_BACKEND=schannel'
|
config: '-DENABLE_DEBUG=ON -DENABLE_UNICODE=ON -DCURL_USE_SCHANNEL=ON -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DCURL_USE_LIBPSL=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBSSH2=ON -DUSE_WIN32_IDN=ON -DCURL_USE_GSASL=ON -DCURL_USE_OPENSSL=ON -DCURL_DEFAULT_SSL_BACKEND=schannel'
|
||||||
- name: 'openssl'
|
- name: 'openssl'
|
||||||
install: 'brotli zlib zstd libpsl nghttp2 nghttp3 openssl libssh2 pkgconf gsasl'
|
install: 'brotli zlib zstd libpsl nghttp2 nghttp3 openssl libssh2 pkgconf gsasl'
|
||||||
arch: 'x64'
|
arch: 'x64'
|
||||||
plat: 'windows'
|
plat: 'windows'
|
||||||
type: 'Debug'
|
type: 'Debug'
|
||||||
tflags: '~1516 ~2301 ~2302 ~2303 ~2307'
|
tflags: '~1516 ~2301 ~2302 ~2303 ~2307'
|
||||||
config: '-DENABLE_DEBUG=ON -DENABLE_UNICODE=OFF -DCURL_USE_SCHANNEL=OFF -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DCURL_USE_LIBPSL=ON -DUSE_NGHTTP2=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_OPENSSL=ON -DUSE_OPENSSL_QUIC=ON -DCURL_USE_GSASL=ON'
|
config: '-DENABLE_DEBUG=ON -DENABLE_UNICODE=OFF -DCURL_USE_SCHANNEL=OFF -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DCURL_USE_LIBPSL=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_OPENSSL=ON -DUSE_OPENSSL_QUIC=ON -DCURL_USE_GSASL=ON'
|
||||||
- name: 'openssl'
|
- name: 'openssl'
|
||||||
install: 'brotli zlib zstd nghttp2 nghttp3 openssl libssh2'
|
install: 'brotli zlib zstd nghttp2 nghttp3 openssl libssh2'
|
||||||
arch: 'x64'
|
arch: 'x64'
|
||||||
plat: 'uwp'
|
plat: 'uwp'
|
||||||
type: 'Debug'
|
type: 'Debug'
|
||||||
tflags: 'skipall'
|
tflags: 'skipall'
|
||||||
config: '-DENABLE_DEBUG=ON -DENABLE_UNICODE=OFF -DCURL_USE_SCHANNEL=OFF -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DUSE_NGHTTP2=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_OPENSSL=ON -DUSE_OPENSSL_QUIC=ON'
|
config: '-DENABLE_DEBUG=ON -DENABLE_UNICODE=OFF -DCURL_USE_SCHANNEL=OFF -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_OPENSSL=ON -DUSE_OPENSSL_QUIC=ON'
|
||||||
- name: 'libressl'
|
- name: 'libressl'
|
||||||
install: 'brotli zlib zstd libpsl nghttp2 libressl libssh2[core,zlib]'
|
install: 'brotli zlib zstd libpsl nghttp2 libressl libssh2[core,zlib]'
|
||||||
arch: 'x64'
|
arch: 'x64'
|
||||||
plat: 'windows'
|
plat: 'windows'
|
||||||
type: 'Debug'
|
type: 'Debug'
|
||||||
tflags: '~1516 ~2301 ~2302 ~2303 ~2307'
|
tflags: '~1516 ~2301 ~2302 ~2303 ~2307'
|
||||||
config: '-DENABLE_DEBUG=ON -DENABLE_UNICODE=OFF -DCURL_USE_SCHANNEL=OFF -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DCURL_USE_LIBPSL=ON -DUSE_NGHTTP2=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_OPENSSL=ON'
|
config: '-DENABLE_DEBUG=ON -DENABLE_UNICODE=OFF -DCURL_USE_SCHANNEL=OFF -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DCURL_USE_LIBPSL=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_OPENSSL=ON'
|
||||||
- name: 'boringssl-ECH'
|
- name: 'boringssl-ECH'
|
||||||
install: 'brotli zlib zstd libpsl nghttp2 boringssl libssh2[core,zlib]'
|
install: 'brotli zlib zstd libpsl nghttp2 boringssl libssh2[core,zlib]'
|
||||||
arch: 'x64'
|
arch: 'x64'
|
||||||
plat: 'windows'
|
plat: 'windows'
|
||||||
type: 'Debug'
|
type: 'Debug'
|
||||||
tflags: '~1516 ~2301 ~2302 ~2303 ~2307'
|
tflags: '~1516 ~2301 ~2302 ~2303 ~2307'
|
||||||
config: '-DENABLE_DEBUG=ON -DENABLE_UNICODE=OFF -DCURL_USE_SCHANNEL=OFF -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DCURL_USE_LIBPSL=ON -DUSE_NGHTTP2=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_OPENSSL=ON -DUSE_HTTPSRR=ON -DUSE_ECH=ON'
|
config: '-DENABLE_DEBUG=ON -DENABLE_UNICODE=OFF -DCURL_USE_SCHANNEL=OFF -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DCURL_USE_LIBPSL=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_OPENSSL=ON -DUSE_HTTPSRR=ON -DUSE_ECH=ON'
|
||||||
- name: '!ssl'
|
- name: '!ssl'
|
||||||
install: 'brotli zlib zstd libpsl pkgconf libidn2 libssh'
|
install: 'brotli zlib zstd libpsl pkgconf libidn2 libssh'
|
||||||
arch: 'x64'
|
arch: 'x64'
|
||||||
|
@ -544,7 +544,7 @@ jobs:
|
||||||
plat: 'windows'
|
plat: 'windows'
|
||||||
type: 'Debug'
|
type: 'Debug'
|
||||||
tflags: '~1516'
|
tflags: '~1516'
|
||||||
config: '-DENABLE_DEBUG=ON -DENABLE_UNICODE=OFF -DCURL_USE_SCHANNEL=OFF -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DCURL_USE_LIBPSL=ON -DUSE_NGHTTP2=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_WOLFSSL=ON -DCURL_USE_GSASL=ON'
|
config: '-DENABLE_DEBUG=ON -DENABLE_UNICODE=OFF -DCURL_USE_SCHANNEL=OFF -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DCURL_USE_LIBPSL=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_WOLFSSL=ON -DCURL_USE_GSASL=ON'
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
|
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
|
||||||
|
|
Загрузка…
Ссылка в новой задаче