From 0be50f44f8ef51ea4b95d278c7da8a0c678dac3a Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Tue, 10 Oct 2023 00:26:46 +0200 Subject: [PATCH] CI: ssl: add git id support for wolfssl download Allow to download a git revision directly with the git ID. WOLFSSL_VERSION=git-d83f2fa ./scripts/build-ssl.sh --- scripts/build-ssl.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/build-ssl.sh b/scripts/build-ssl.sh index 613c286dc..1c17775c3 100755 --- a/scripts/build-ssl.sh +++ b/scripts/build-ssl.sh @@ -125,16 +125,22 @@ download_quictls () { download_wolfssl () { if [ ! -f "download-cache/wolfssl-${WOLFSSL_VERSION}.tar.gz" ]; then mkdir -p download-cache + if [ "${WOLFSSL_VERSION%%-*}" != "git" ]; then wget -q -O "download-cache/wolfssl-${WOLFSSL_VERSION}.tar.gz" \ - "https://github.com/wolfSSL/wolfssl/archive/refs/tags/v${WOLFSSL_VERSION}-stable.tar.gz" + "https://github.com/wolfSSL/wolfssl/archive/refs/tags/v${WOLFSSL_VERSION}-stable.tar.gz" + else + wget -q -O "download-cache/wolfssl-${WOLFSSL_VERSION}.tar.gz" \ + "https://github.com/wolfSSL/wolfssl/archive/${WOLFSSL_VERSION##git-}.tar.gz" + fi fi } build_wolfssl () { if [ "$(cat ${HOME}/opt/.wolfssl-version)" != "${WOLFSSL_VERSION}" ]; then - tar zxf "download-cache/wolfssl-${WOLFSSL_VERSION}.tar.gz" + mkdir "wolfssl-${WOLFSSL_VERSION}/" + tar zxf "download-cache/wolfssl-${WOLFSSL_VERSION}.tar.gz" -C "wolfssl-${WOLFSSL_VERSION}/" --strip-components=1 ( - cd "wolfssl-${WOLFSSL_VERSION}-stable/" + cd "wolfssl-${WOLFSSL_VERSION}/" autoreconf -i ./configure --enable-haproxy --enable-quic --prefix="${HOME}/opt" make -j$(nproc)