diff options
| author | Ilya Shipitsin <chipitsine@gmail.com> | 2022-12-12 19:15:22 +0500 |
|---|---|---|
| committer | William Lallemand <wlallemand@haproxy.org> | 2022-12-12 16:20:48 +0100 |
| commit | 4a04cd35ae89bf6a3bb7620f7a49804de3240ac4 (patch) | |
| tree | 60a43d7b699e492f065b8a1719bf6dd0f9cb0264 /.github | |
| parent | 4b167006fd574d6377cfc59afb31b167d8694c11 (diff) | |
| download | haproxy-4a04cd35ae89bf6a3bb7620f7a49804de3240ac4.tar.gz | |
CI: github: split ssl lib selection based on git branch
when *SSL_VERSION="latest" behaviour was introduced, it seems to be fine
for development branches, but too intrusive for stable branches.
let us limit "latest" semantic only for development builds, if branch name
contains "haproxy-" it is supposed to be stable branch, no latest openssl
should be taken
[wla: must be backported as far as 2.6]
Signed-off-by: William Lallemand <wlallemand@haproxy.org>
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/matrix.py | 10 | ||||
| -rw-r--r-- | .github/workflows/vtest.yml | 2 |
2 files changed, 5 insertions, 7 deletions
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: {} <build_type>".format(sys.argv[0]), file=sys.stderr) + print("Usage: {} <ref_name>".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: |