From d04c9198b7f81b77b7204410919be35c3b31f2b1 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 20 Aug 2025 13:32:38 +0200 Subject: [PATCH] make unity setting per job --- .github/workflows/http3-linux.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml index a62af27375..b76293e763 100644 --- a/.github/workflows/http3-linux.yml +++ b/.github/workflows/http3-linux.yml @@ -262,14 +262,14 @@ jobs: LDFLAGS=-Wl,-rpath,/home/runner/openssl/build/lib --with-ngtcp2 --enable-debug --disable-ntlm --with-openssl=/home/runner/openssl/build --enable-ssls-export - --with-libuv + --with-libuv --enable-unity - name: 'openssl' PKG_CONFIG_PATH: /home/runner/openssl/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig generate: >- -DOPENSSL_ROOT_DIR=/home/runner/openssl/build -DUSE_NGTCP2=ON -DENABLE_DEBUG=ON -DCURL_DISABLE_NTLM=ON - -DCURL_USE_LIBUV=ON + -DCURL_USE_LIBUV=ON -DCMAKE_UNITY_BUILD=ON - name: 'quictls' PKG_CONFIG_PATH: /home/runner/quictls/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig @@ -277,14 +277,14 @@ jobs: LDFLAGS=-Wl,-rpath,/home/runner/quictls/build/lib --with-ngtcp2 --enable-debug --disable-ntlm --with-openssl=/home/runner/quictls/build --enable-ssls-export - --with-libuv + --with-libuv --enable-unity - name: 'quictls' PKG_CONFIG_PATH: /home/runner/quictls/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig generate: >- -DOPENSSL_ROOT_DIR=/home/runner/quictls/build -DUSE_NGTCP2=ON -DENABLE_DEBUG=ON -DCURL_DISABLE_NTLM=ON - -DCURL_USE_LIBUV=ON + -DCURL_USE_LIBUV=ON -DCMAKE_UNITY_BUILD=ON - name: 'gnutls' PKG_CONFIG_PATH: /home/runner/gnutls/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig @@ -292,14 +292,14 @@ jobs: LDFLAGS=-Wl,-rpath,/home/runner/gnutls/build/lib --with-ngtcp2 --enable-debug --with-gnutls=/home/runner/gnutls/build --enable-ssls-export - --with-libuv + --with-libuv --enable-unity - name: 'gnutls' PKG_CONFIG_PATH: /home/runner/gnutls/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig generate: >- -DCURL_USE_GNUTLS=ON -DUSE_NGTCP2=ON -DENABLE_DEBUG=ON -DCURL_DISABLE_NTLM=ON - -DCURL_USE_LIBUV=ON + -DCURL_USE_LIBUV=ON -DCMAKE_UNITY_BUILD=ON - name: 'wolfssl' PKG_CONFIG_PATH: /home/runner/wolfssl/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig @@ -308,14 +308,14 @@ jobs: --with-ngtcp2 --enable-debug --with-wolfssl=/home/runner/wolfssl/build --enable-ech --enable-ssls-export - --with-libuv + --with-libuv --enable-unity - name: 'wolfssl' PKG_CONFIG_PATH: /home/runner/wolfssl/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig generate: >- -DCURL_USE_WOLFSSL=ON -DUSE_NGTCP2=ON -DENABLE_DEBUG=ON -DUSE_ECH=ON - -DCURL_USE_LIBUV=ON + -DCURL_USE_LIBUV=ON -DCMAKE_UNITY_BUILD=ON - name: 'openssl-quic' PKG_CONFIG_PATH: /home/runner/openssl/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig @@ -323,14 +323,14 @@ jobs: LDFLAGS=-Wl,-rpath,/home/runner/openssl/build/lib --enable-debug --disable-ntlm --with-openssl=/home/runner/openssl/build --with-openssl-quic - --with-libuv + --with-libuv --enable-unity - name: 'openssl-quic' PKG_CONFIG_PATH: /home/runner/openssl/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig generate: >- -DOPENSSL_ROOT_DIR=/home/runner/openssl/build -DUSE_OPENSSL_QUIC=ON -DUSE_NGTCP2=ON -DENABLE_DEBUG=ON -DCURL_DISABLE_NTLM=ON - -DCURL_USE_LIBUV=ON + -DCURL_USE_LIBUV=ON -DCMAKE_UNITY_BUILD=ON - name: 'quiche' configure: >- @@ -339,7 +339,7 @@ jobs: --enable-debug --with-quiche=/home/runner/quiche/target/release --with-ca-fallback - --with-libuv + --with-libuv --enable-unity - name: 'quiche' PKG_CONFIG_PATH: /home/runner/quiche/target/release @@ -347,7 +347,7 @@ jobs: -DOPENSSL_ROOT_DIR=/home/runner/quiche/quiche/deps/boringssl/src -DENABLE_DEBUG=ON -DUSE_QUICHE=ON -DCURL_CA_FALLBACK=ON - -DCURL_USE_LIBUV=ON + -DCURL_USE_LIBUV=ON -DCMAKE_UNITY_BUILD=ON steps: - name: 'install prereqs' @@ -488,7 +488,7 @@ jobs: if [ "${MATRIX_BUILD}" = 'cmake' ]; then cmake -B bld -G Ninja \ -DCMAKE_C_COMPILER_TARGET="$(uname -m)-pc-linux-gnu" -DBUILD_STATIC_LIBS=ON \ - -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON \ + -DCURL_WERROR=ON \ -DTEST_NGHTTPX=/home/runner/nghttp2/build/bin/nghttpx \ -DHTTPD_NGHTTPX=/home/runner/nghttp2/build/bin/nghttpx \ ${MATRIX_GENERATE}