From 2c6330338433ca038e067496f9d76271e2f413c2 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 22 Jun 2024 00:24:31 +0200 Subject: [PATCH] ci/GHA: tidy up build-from-source steps [ci skip] - make curl downloads less verbose. - fix cmake warning: ``` CMake Warning: No source or binary directory provided. Both will be assumed to be the same as the current working directory, but note that this warning will become a fatal error in future CMake releases. ``` Ref: https://github.com/libssh2/libssh2/actions/runs/9509866494/job/26213472410#step:5:32 --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc3a0edf..1eb44fbc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,13 +138,13 @@ jobs: if: ${{ matrix.crypto == 'mbedTLS' }} run: | MBEDTLSVER=mbedtls-3.5.1 - curl -L https://github.com/Mbed-TLS/mbedtls/archive/$MBEDTLSVER.tar.gz | tar -xzf - + curl -fsS -L https://github.com/Mbed-TLS/mbedtls/archive/$MBEDTLSVER.tar.gz | tar -xzf - cd mbedtls-$MBEDTLSVER if [ '${{ matrix.arch }}' = 'i386' ]; then crossoptions='-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_VERSION=1 -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }}' cflags='-m32 -mpclmul -msse2 -maes' fi - cmake ${crossoptions} \ + cmake . ${crossoptions} \ "-DCMAKE_C_FLAGS=${cflags}" \ -DENABLE_PROGRAMS=OFF \ -DENABLE_TESTING=OFF \ @@ -162,8 +162,8 @@ jobs: BORINGSSLVER=1b7fdbd9101dedc3e0aa3fcf4ff74eacddb34ecc mkdir boringssl cd boringssl - curl "https://boringssl.googlesource.com/boringssl/+archive/$BORINGSSLVER.tar.gz" | tar -xzf - - cmake \ + curl -fsS https://boringssl.googlesource.com/boringssl/+archive/$BORINGSSLVER.tar.gz | tar -xzf - + cmake . \ -DOPENSSL_SMALL=ON \ -DCMAKE_C_FLAGS=-fPIC \ "-DCMAKE_INSTALL_PREFIX=$PWD/../usr" @@ -176,7 +176,7 @@ jobs: if: ${{ matrix.crypto == 'OpenSSL-3-no-deprecated' }} run: | OPENSSLVER=openssl-3.2.0 - curl -L https://www.openssl.org/source/$OPENSSLVER.tar.gz | tar -xzf - + curl -fsS -L https://www.openssl.org/source/$OPENSSLVER.tar.gz | tar -xzf - cd $OPENSSLVER ./Configure no-deprecated \ no-apps no-docs no-tests no-makedepend \