diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml index 027ef9b7da..a19710d33c 100644 --- a/.github/workflows/http3-linux.yml +++ b/.github/workflows/http3-linux.yml @@ -262,14 +262,13 @@ jobs: LDFLAGS=-Wl,-rpath,/home/runner/openssl/build/lib --with-ngtcp2 --disable-ntlm --with-openssl=/home/runner/openssl/build --enable-ssls-export - --with-libuv - 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 -DCURL_DISABLE_NTLM=ON - -DCURL_USE_LIBUV=ON -DCMAKE_UNITY_BUILD=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 +276,13 @@ jobs: LDFLAGS=-Wl,-rpath,/home/runner/quictls/build/lib --with-ngtcp2 --disable-ntlm --with-openssl=/home/runner/quictls/build --enable-ssls-export - --with-libuv --enable-unity + --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 -DCURL_DISABLE_NTLM=ON - -DCURL_USE_LIBUV=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 +290,13 @@ jobs: LDFLAGS=-Wl,-rpath,/home/runner/gnutls/build/lib --with-ngtcp2 --with-gnutls=/home/runner/gnutls/build --enable-ssls-export - --with-libuv - 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 -DCURL_DISABLE_NTLM=ON - -DCURL_USE_LIBUV=ON -DCMAKE_UNITY_BUILD=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 +305,13 @@ jobs: --with-ngtcp2 --with-wolfssl=/home/runner/wolfssl/build --enable-ech --enable-ssls-export - --with-libuv --enable-unity + --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 -DUSE_ECH=ON - -DCURL_USE_LIBUV=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 +319,13 @@ jobs: LDFLAGS=-Wl,-rpath,/home/runner/openssl/build/lib --disable-ntlm --with-openssl=/home/runner/openssl/build --with-openssl-quic - --with-libuv - 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 -DCURL_DISABLE_NTLM=ON - -DCURL_USE_LIBUV=ON -DCMAKE_UNITY_BUILD=ON + -DCMAKE_UNITY_BUILD=ON - name: 'quiche' configure: >- @@ -338,7 +333,7 @@ jobs: --with-openssl=/home/runner/quiche/quiche/deps/boringssl/src --with-quiche=/home/runner/quiche/target/release --with-ca-fallback - --with-libuv --enable-unity + --enable-unity - name: 'quiche' PKG_CONFIG_PATH: /home/runner/quiche/target/release @@ -346,7 +341,6 @@ jobs: -DOPENSSL_ROOT_DIR=/home/runner/quiche/quiche/deps/boringssl/src -DUSE_QUICHE=ON -DCURL_CA_FALLBACK=ON - -DCURL_USE_LIBUV=ON steps: - name: 'install prereqs' @@ -488,11 +482,13 @@ jobs: cmake -B bld -G Ninja \ -DCMAKE_C_COMPILER_TARGET="$(uname -m)-pc-linux-gnu" -DBUILD_STATIC_LIBS=ON \ -DCURL_WERROR=ON -DENABLE_DEBUG=ON \ + -DCURL_USE_LIBUV=ON \ -DTEST_NGHTTPX=/home/runner/nghttp2/build/bin/nghttpx \ -DHTTPD_NGHTTPX=/home/runner/nghttp2/build/bin/nghttpx \ ${MATRIX_GENERATE} else mkdir bld && cd bld && ../configure --enable-warnings --enable-werror --enable-debug \ + --with-libuv \ --with-test-nghttpx=/home/runner/nghttp2/build/bin/nghttpx \ --disable-dependency-tracking \ ${MATRIX_CONFIGURE}