curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-09 13:49:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

GHA/linux: tidy up around wolfSSH

Browse Source 
- fix filter expression for cache step.
  It did not cause an issue because `wolfssh` is always paired with
  a `wolfssl*`.

- build `wolfssh` against `wolfssl-opensslextra` (was: `wolfssl-all`).
  It makes `wolfssh` builds `OPENSSL_COEXIST`-compatible, and clarifies
  its use in the clang-tidy job. The earlier mixup didn't cause issues
  because the clang-tidy job is compile-only (using their headers only.)
  Useful side-effect is making the wolfssh build valgrind-tested.

Reported-by: bo0tzz on github
Ref: https://github.com/curl/curl/discussions/16970#discussioncomment-12752019

Closes #17109
This commit is contained in:
Viktor Szakats 2025-04-20 11:59:06 +02:00
parent c4e776cafa
commit b12b812196
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/linux.yml vendored
View File

@ -96,13 +96,13 @@ jobs:
- name: wolfssl-all - name: wolfssl-all
install_packages: zlib1g-dev install_packages: zlib1g-dev
install_steps: wolfssl-all wolfssh install_steps: wolfssl-all
configure: LDFLAGS="-Wl,-rpath,$HOME/wolfssl-all/lib" --with-wolfssl=$HOME/wolfssl-all --with-wolfssh=$HOME/wolfssh --enable-ech --enable-debug configure: LDFLAGS="-Wl,-rpath,$HOME/wolfssl-all/lib" --with-wolfssl=$HOME/wolfssl-all --enable-ech --enable-debug
- name: wolfssl-opensslextra valgrind - name: wolfssl-opensslextra valgrind
install_packages: zlib1g-dev valgrind install_packages: zlib1g-dev valgrind
install_steps: wolfssl-opensslextra install_steps: wolfssl-opensslextra wolfssh
configure: LDFLAGS="-Wl,-rpath,$HOME/wolfssl-opensslextra/lib" --with-wolfssl=$HOME/wolfssl-opensslextra --enable-ech --enable-debug configure: LDFLAGS="-Wl,-rpath,$HOME/wolfssl-opensslextra/lib" --with-wolfssl=$HOME/wolfssl-opensslextra --with-wolfssh=$HOME/wolfssh --enable-ech --enable-debug
- name: mbedtls valgrind - name: mbedtls valgrind
install_packages: libnghttp2-dev libldap-dev valgrind install_packages: libnghttp2-dev libldap-dev valgrind
@ -382,7 +382,7 @@ jobs:
path: ~/wolfssl-all path: ~/wolfssl-all
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.wolfssl-version }} key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.wolfssl-version }}
- name: 'build wolfssl (all)' - name: 'build wolfssl (all)' # does not support `OPENSSL_COEXIST`
if: contains(matrix.build.install_steps, 'wolfssl-all') && steps.cache-wolfssl-all.outputs.cache-hit != 'true' if: contains(matrix.build.install_steps, 'wolfssl-all') && steps.cache-wolfssl-all.outputs.cache-hit != 'true'
run: | run: |
curl -LOsSf --retry 6 --retry-connrefused --max-time 999 \ curl -LOsSf --retry 6 --retry-connrefused --max-time 999 \
@ -394,7 +394,7 @@ jobs:
--disable-benchmark --disable-crypttests --disable-examples --prefix=$HOME/wolfssl-all --disable-benchmark --disable-crypttests --disable-examples --prefix=$HOME/wolfssl-all
make install make install
- name: 'cache wolfssl (opensslextra)' - name: 'cache wolfssl (opensslextra)' # does support `OPENSSL_COEXIST`
if: contains(matrix.build.install_steps, 'wolfssl-opensslextra') if: contains(matrix.build.install_steps, 'wolfssl-opensslextra')
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4 uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
id: cache-wolfssl-opensslextra id: cache-wolfssl-opensslextra
@ -412,12 +412,12 @@ jobs:
tar -xzf v${{ env.wolfssl-version }}-stable.tar.gz tar -xzf v${{ env.wolfssl-version }}-stable.tar.gz
cd wolfssl-${{ env.wolfssl-version }}-stable cd wolfssl-${{ env.wolfssl-version }}-stable
./autogen.sh ./autogen.sh
./configure --disable-dependency-tracking --enable-tls13 --enable-harden --enable-ech --enable-opensslextra \ ./configure --disable-dependency-tracking --enable-tls13 --enable-harden --enable-wolfssh --enable-ech --enable-opensslextra \
--disable-benchmark --disable-crypttests --disable-examples --prefix=$HOME/wolfssl-opensslextra --disable-benchmark --disable-crypttests --disable-examples --prefix=$HOME/wolfssl-opensslextra
make install make install
- name: 'cache wolfssh' - name: 'cache wolfssh'
if: contains(matrix.build.install_steps, 'wolfssl') if: contains(matrix.build.install_steps, 'wolfssh')
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4 uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
id: cache-wolfssh id: cache-wolfssh
env: env:
@ -434,7 +434,7 @@ jobs:
tar -xzf v${{ env.wolfssh-version }}-stable.tar.gz tar -xzf v${{ env.wolfssh-version }}-stable.tar.gz
cd wolfssh-${{ env.wolfssh-version }}-stable cd wolfssh-${{ env.wolfssh-version }}-stable
./autogen.sh ./autogen.sh
./configure --disable-dependency-tracking --with-wolfssl=$HOME/wolfssl-all --enable-scp --enable-sftp --disable-term \ ./configure --disable-dependency-tracking --with-wolfssl=$HOME/wolfssl-opensslextra --enable-scp --enable-sftp --disable-term \
--disable-examples --prefix=$HOME/wolfssh --disable-examples --prefix=$HOME/wolfssh
make install make install