lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-17 04:22:32 +03:00
Code Activity

ci/GHA: simplify mbedTLS build hack for autotools (#1425)

Browse Source 
Follow-up to e973493f99 #1393
This commit is contained in:
Viktor Szakats
2024-07-13 11:40:07 +02:00
committed by GitHub
parent 9f23a3bbaf
commit 42ef8f3f0b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@@ -593,7 +593,7 @@ jobs:
cmake: -DCRYPTO_BACKEND=Libgcrypt cmake: -DCRYPTO_BACKEND=Libgcrypt
- name: 'mbedTLS' - name: 'mbedTLS'
install: mbedtls install: mbedtls
configure: --with-crypto=mbedtls "--with-libmbedcrypto-prefix=$(brew --prefix)" configure: --with-crypto=mbedtls "--with-libmbedcrypto-prefix=$(brew --prefix)" CPPFLAGS=-D_LIBSSH2_DISABLE_MBEDTLS36_PK_LOAD_FILE
cmake: -DCRYPTO_BACKEND=mbedTLS "-DMBEDTLS_INCLUDE_DIR=$(brew --prefix)/opt/mbedtls/include" "-DMBEDCRYPTO_LIBRARY=$(brew --prefix)/opt/mbedtls/lib/libmbedcrypto.a" -DCMAKE_C_FLAGS=-D_LIBSSH2_DISABLE_MBEDTLS36_PK_LOAD_FILE cmake: -DCRYPTO_BACKEND=mbedTLS "-DMBEDTLS_INCLUDE_DIR=$(brew --prefix)/opt/mbedtls/include" "-DMBEDCRYPTO_LIBRARY=$(brew --prefix)/opt/mbedtls/lib/libmbedcrypto.a" -DCMAKE_C_FLAGS=-D_LIBSSH2_DISABLE_MBEDTLS36_PK_LOAD_FILE
steps: steps:
- name: 'install packages' - name: 'install packages'
@@ -605,7 +605,6 @@ jobs:
- name: 'autotools configure' - name: 'autotools configure'
if: ${{ matrix.build == 'autotools' }} if: ${{ matrix.build == 'autotools' }}
run: | run: |
[ '${{ matrix.crypto.name }}' = 'mbedTLS' ] && export CPPFLAGS=-D_LIBSSH2_DISABLE_MBEDTLS36_PK_LOAD_FILE
mkdir bld && cd bld && ../configure --enable-werror --enable-debug \ mkdir bld && cd bld && ../configure --enable-werror --enable-debug \
--with-libz ${{ matrix.crypto.configure }} \ --with-libz ${{ matrix.crypto.configure }} \
--disable-docker-tests \ --disable-docker-tests \