CI: github: define the right quictls version in each jobs

openssl+quictls is not maintained anymore (quictls/openssl), however we
still need to test openssl+quictls 1.1.1. Other openssl+quictls branches
don't need to be tested.

The quictls hardfork is tested in the 'quictls' job, it uses the
'main' branch in the quictls/quictls repository.

diff --git a/.github/matrix.py b/.github/matrix.py
index 9c9b966f696a3939c4b507ab74e8b7b187985f65..8fe62b3ea13cb54e10efae2aa1cda6a18ed7ed71 100755 (executable)
--- a/.github/matrix.py
+++ b/.github/matrix.py
@@ -222,7 +222,7 @@ def main(ref_name):
             "OPENSSL_VERSION=1.0.2u",
             "OPENSSL_VERSION=1.1.1s",
             "OPENSSL_VERSION=3.5.1",
-            "QUICTLS=yes",
+            "QUICTLS_VERSION=OpenSSL_1_1_1w-quic1",
             "WOLFSSL_VERSION=5.7.0",
             "AWS_LC_VERSION=1.39.0",
             # "BORINGSSL=yes",
@@ -261,7 +261,7 @@ def main(ref_name):
             except:
               pass
 
-            if ssl == "BORINGSSL=yes" or ssl == "QUICTLS=yes" or "LIBRESSL" in ssl or "WOLFSSL" in ssl or "AWS_LC" in ssl or openssl_supports_quic:
+            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:
                 flags.append("USE_QUIC=1")
 
             matrix.append(

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index d420aa9a5000f5c6b18fac9cc3098fb98119788b..07e3b35f9796660a907e29674d60f7220f661108 100644 (file)
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -27,7 +27,7 @@ jobs:
           libsystemd-dev
     - name: Install QUICTLS
       run: |
-        QUICTLS=yes scripts/build-ssl.sh
+        QUICTLS_VERSION=OpenSSL_1_1_1w-quic1 scripts/build-ssl.sh
     - name: Download Coverity build tool
       run: |
         wget -c -N https://scan.coverity.com/download/linux64 --post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=Haproxy" -O coverity_tool.tar.gz

diff --git a/.github/workflows/cross-zoo.yml b/.github/workflows/cross-zoo.yml
index 3dd638a16f81da0c9ed72dd3494c6fbb6f017d59..5f4e234f2b7434dbd1d9b191e22da0c625c0e196 100644 (file)
--- a/.github/workflows/cross-zoo.yml
+++ b/.github/workflows/cross-zoo.yml
@@ -104,7 +104,7 @@ jobs:
 
     - name: install quictls
       run: |
-        QUICTLS_EXTRA_ARGS="--cross-compile-prefix=${{ matrix.platform.arch }}- ${{ matrix.platform.target }}" QUICTLS=yes scripts/build-ssl.sh
+        QUICTLS_EXTRA_ARGS="--cross-compile-prefix=${{ matrix.platform.arch }}- ${{ matrix.platform.target }}" QUICTLS_VERSION=OpenSSL_1_1_1w-quic1 scripts/build-ssl.sh
 
     - name: Build
       run: |

diff --git a/.github/workflows/quictls.yml b/.github/workflows/quictls.yml
index a8b2f96b4d025ab758cee1d942cf3489a6d2dff7..5cedbae19c533002f27c89180c09ccca9b67c854 100644 (file)
--- a/.github/workflows/quictls.yml
+++ b/.github/workflows/quictls.yml
@@ -23,7 +23,7 @@ jobs:
           sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
           sudo apt-get --no-install-recommends -y install socat gdb
       - name: Install QuicTLS
-        run: env QUICTLS=yes QUICTLS_URL=https://github.com/quictls/quictls scripts/build-ssl.sh
+        run: env QUICTLS_VERSION=main QUICTLS_URL=https://github.com/quictls/quictls scripts/build-ssl.sh
       - name: Compile HAProxy
         run: |
           make -j$(nproc) ERR=1 CC=gcc TARGET=linux-glibc \

diff --git a/.github/workflows/vtest.yml b/.github/workflows/vtest.yml
index 1bd9cb2eb40c55f09f6e2548fe4ac8b61cb58a6d..14e4a67761e79b30ecaddc08b2a2b9314b72c94f 100644 (file)
--- a/.github/workflows/vtest.yml
+++ b/.github/workflows/vtest.yml
@@ -57,7 +57,7 @@ jobs:
         echo "key=$(echo ${{ matrix.name }} | sha256sum | awk '{print $1}')" >> $GITHUB_OUTPUT
 
     - name: Cache SSL libs
-      if: ${{ matrix.ssl && matrix.ssl != 'stock' && matrix.ssl != 'BORINGSSL=yes' && matrix.ssl != 'QUICTLS=yes' }}
+      if: ${{ matrix.ssl && matrix.ssl != 'stock' && matrix.ssl != 'BORINGSSL=yes' && 'QUICTLS' not in matrix.ssl }}
       id: cache_ssl
       uses: actions/cache@v4
       with: