Skip to content

Commit 9ada909

Browse files
committed
CI: github: activate USE_QMUX=1 for QUIC builds
Ensure QMux protocol can be tested when QUIC is already chosen. This makes sense as for now QMux cannot be compiled without QUIC already selected.
1 parent 4a5c8bc commit 9ada909

9 files changed

Lines changed: 9 additions & 8 deletions

File tree

.github/matrix.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ def main(ref_name):
284284

285285
if ssl == "BORINGSSL=yes" or "QUICTLS" in ssl or "LIBRESSL" in ssl or "WOLFSSL" in ssl or "AWS_LC" in ssl or openssl_supports_quic:
286286
flags.append("USE_QUIC=1")
287+
flags.append("USE_QMUX=1")
287288

288289
matrix.append(
289290
{

.github/workflows/aws-lc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Compile HAProxy
4545
run: |
4646
make -j$(nproc) ERR=1 CC=gcc TARGET=linux-glibc \
47-
USE_OPENSSL_AWSLC=1 USE_QUIC=1 \
47+
USE_OPENSSL_AWSLC=1 USE_QUIC=1 USE_QMUX=1 \
4848
SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include \
4949
DEBUG="-DDEBUG_POOL_INTEGRITY -DDEBUG_UNIT" \
5050
ADDLIB="-Wl,-rpath,/usr/local/lib/ -Wl,-rpath,$HOME/opt/lib/"

.github/workflows/coverity.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Build with Coverity build tool
3939
run: |
4040
export PATH=`pwd`/coverity_tool/bin:$PATH
41-
cov-build --dir cov-int make CC=clang TARGET=linux-glibc USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_LUA=1 USE_OPENSSL=1 USE_QUIC=1 USE_WURFL=1 WURFL_INC=addons/wurfl/dummy WURFL_LIB=addons/wurfl/dummy USE_DEVICEATLAS=1 DEVICEATLAS_SRC=addons/deviceatlas/dummy USE_51DEGREES=1 51DEGREES_SRC=addons/51degrees/dummy/pattern ADDLIB=\"-Wl,-rpath,$HOME/opt/lib/\" SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include DEBUG+=-DDEBUG_STRICT=2 DEBUG+=-DDEBUG_USE_ABORT=1
41+
cov-build --dir cov-int make CC=clang TARGET=linux-glibc USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_LUA=1 USE_OPENSSL=1 USE_QUIC=1 USE_QMUX=1 USE_WURFL=1 WURFL_INC=addons/wurfl/dummy WURFL_LIB=addons/wurfl/dummy USE_DEVICEATLAS=1 DEVICEATLAS_SRC=addons/deviceatlas/dummy USE_51DEGREES=1 51DEGREES_SRC=addons/51degrees/dummy/pattern ADDLIB=\"-Wl,-rpath,$HOME/opt/lib/\" SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include DEBUG+=-DDEBUG_STRICT=2 DEBUG+=-DDEBUG_USE_ABORT=1
4242
- name: Submit build result to Coverity Scan
4343
run: |
4444
tar czvf cov.tar.gz cov-int

.github/workflows/cross-zoo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,5 +112,5 @@ jobs:
112112
113113
- name: Build
114114
run: |
115-
make ERR=1 CC=${{ matrix.platform.arch }}-gcc TARGET=linux-glibc USE_LIBCRYPT= USE_OPENSSL=1 USE_QUIC=1 USE_PROMEX=1 SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include ADDLIB="-Wl,-rpath,${HOME}/opt/lib"
115+
make ERR=1 CC=${{ matrix.platform.arch }}-gcc TARGET=linux-glibc USE_LIBCRYPT= USE_OPENSSL=1 USE_QUIC=1 USE_QMUX=1 USE_PROMEX=1 SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include ADDLIB="-Wl,-rpath,${HOME}/opt/lib"
116116

.github/workflows/fedora-rawhide.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- uses: ./.github/actions/setup-vtest
3535
- name: Compile HAProxy with ${{ matrix.platform.cc }}
3636
run: |
37-
make -j3 CC=${{ matrix.platform.cc }} V=1 ERR=1 TARGET=linux-glibc DEBUG="-DDEBUG_POOL_INTEGRITY -DDEBUG_UNIT" USE_PROMEX=1 USE_OPENSSL=1 USE_QUIC=1 USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_LUA=1 ADDLIB="${{ matrix.platform.ADDLIB_ATOMIC }}" ARCH_FLAGS="${{ matrix.platform.ARCH_FLAGS }}"
37+
make -j3 CC=${{ matrix.platform.cc }} V=1 ERR=1 TARGET=linux-glibc DEBUG="-DDEBUG_POOL_INTEGRITY -DDEBUG_UNIT" USE_PROMEX=1 USE_OPENSSL=1 USE_QUIC=1 USE_QMUX=1 USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_LUA=1 ADDLIB="${{ matrix.platform.ADDLIB_ATOMIC }}" ARCH_FLAGS="${{ matrix.platform.ARCH_FLAGS }}"
3838
make install
3939
- name: Show HAProxy version
4040
id: show-version

.github/workflows/openssl-ech.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Compile HAProxy
2828
run: |
2929
make -j$(nproc) CC=gcc TARGET=linux-glibc \
30-
USE_QUIC=1 USE_OPENSSL=1 USE_ECH=1 \
30+
USE_QUIC=1 USE_QMUX=1 USE_OPENSSL=1 USE_ECH=1 \
3131
SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include \
3232
DEBUG="-DDEBUG_POOL_INTEGRITY -DDEBUG_UNIT" \
3333
ADDLIB="-Wl,-rpath,/usr/local/lib/ -Wl,-rpath,$HOME/opt/lib/" \

.github/workflows/openssl-master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Compile HAProxy
2626
run: |
2727
make -j$(nproc) ERR=1 CC=gcc TARGET=linux-glibc \
28-
USE_QUIC=1 USE_OPENSSL=1 \
28+
USE_QUIC=1 USE_QMUX=1 USE_OPENSSL=1 \
2929
SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include \
3030
DEBUG="-DDEBUG_POOL_INTEGRITY -DDEBUG_UNIT" \
3131
ADDLIB="-Wl,-rpath,/usr/local/lib/ -Wl,-rpath,$HOME/opt/lib/"

.github/workflows/quictls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Compile HAProxy
2828
run: |
2929
make -j$(nproc) ERR=1 CC=gcc TARGET=linux-glibc \
30-
USE_QUIC=1 USE_OPENSSL=1 \
30+
USE_QUIC=1 USE_OPENSSL=1 USE_QMUX=1 \
3131
SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include \
3232
DEBUG="-DDEBUG_POOL_INTEGRITY -DDEBUG_UNIT" \
3333
ADDLIB="-Wl,-rpath,/usr/local/lib/ -Wl,-rpath,$HOME/opt/lib/" \

.github/workflows/wolfssl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Compile HAProxy
2424
run: |
2525
make -j$(nproc) ERR=1 CC=gcc TARGET=linux-glibc \
26-
USE_OPENSSL_WOLFSSL=1 USE_QUIC=1 \
26+
USE_OPENSSL_WOLFSSL=1 USE_QUIC=1 USE_QMUX=1 \
2727
SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include \
2828
DEBUG="-DDEBUG_POOL_INTEGRITY -DDEBUG_UNIT" \
2929
ADDLIB="-Wl,-rpath,/usr/local/lib/ -Wl,-rpath,$HOME/opt/lib/" \

0 commit comments

Comments
 (0)