diff --git a/.github/matrix.py b/.github/matrix.py index 98d0a1f2a..fd9491aee 100755 --- a/.github/matrix.py +++ b/.github/matrix.py @@ -15,12 +15,12 @@ import re from os import environ if len(sys.argv) == 2: - build_type = sys.argv[1] + ref_name = sys.argv[1] else: - print("Usage: {} ".format(sys.argv[0]), file=sys.stderr) + print("Usage: {} ".format(sys.argv[0]), file=sys.stderr) sys.exit(1) -print("Generating matrix for type '{}'.".format(build_type)) +print("Generating matrix for type '{}'.".format(ref_name)) def clean_os(os): @@ -129,11 +129,9 @@ for CC in ["gcc", "clang"]: "stock", "OPENSSL_VERSION=1.0.2u", "OPENSSL_VERSION=1.1.1s", - "OPENSSL_VERSION=latest", - "LIBRESSL_VERSION=latest", "QUICTLS=yes", # "BORINGSSL=yes", - ]: + ] + (["OPENSSL_VERSION=latest", "LIBRESSL_VERSION=latest"] if "haproxy-" not in ref_name else []): flags = ["USE_OPENSSL=1"] if ssl == "BORINGSSL=yes" or ssl == "QUICTLS=yes" or "LIBRESSL" in ssl: flags.append("USE_QUIC=1") diff --git a/.github/workflows/vtest.yml b/.github/workflows/vtest.yml index fb7b1d968..a7cdcc514 100644 --- a/.github/workflows/vtest.yml +++ b/.github/workflows/vtest.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v3 - name: Generate Build Matrix id: set-matrix - run: python3 .github/matrix.py "${{ github.event_name }}" + run: python3 .github/matrix.py "${{ github.ref_name }}" # The Test job actually runs the tests. Test: