diff --git a/.appveyor.yml b/.appveyor.yml index 033f7f4..1dfa598 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -52,6 +52,7 @@ install: - cp %VCLIBDIR%/msvcp*.dll ssh2/ - cp %VCLIBDIR%/msvcr*.dll ssh2/ - cp %OPENSSL_DIR%/bin/*.dll ssh2/ + - ps: ls ssh2/*.dll - for %%I in (%PYTHONVERS%) do %%I\python.exe -V - for %%I in (%PYTHONVERS%) do %%I\Scripts\pip install -U wheel setuptools twine cython @@ -65,12 +66,13 @@ install: - 7z x ci\appveyor\zlib1211.zip build_script: - - dir %OPENSSL_DIR%\lib\VC\x64\MD + - dir %OPENSSL_DIR%\lib\VC\x64\MD\ - ci\\appveyor\\build_zlib.bat - for %%I in (%PYTHONVERS%) do cp C:/zlib/lib/zlibstatic.lib %%I/libs/ - for %%I in (%PYTHONVERS%) do ls %%I/libs/ - ci\\appveyor\\build_ssh2.bat - for %%I in (%PYTHONVERS%) do cp build_dir/src/libssh2.lib %%I/libs/ || cp build_dir/src/Release/libssh2.lib %%I/libs/ + - for %%I in (%PYTHONVERS%) do ls %%I/libs/ - rm -f ssh2/*.c test_script: diff --git a/ci/appveyor/build_ssh2.bat b/ci/appveyor/build_ssh2.bat index 6e318cc..79490c2 100755 --- a/ci/appveyor/build_ssh2.bat +++ b/ci/appveyor/build_ssh2.bat @@ -16,8 +16,10 @@ cmake ..\libssh2 -G "NMake Makefiles" ^ -DOPENSSL_ROOT_DIR=%OPENSSL_DIR% ) -cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto.lib %APPVEYOR_BUILD_FOLDER% -cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl.lib %APPVEYOR_BUILD_FOLDER% +cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto*.lib %APPVEYOR_BUILD_FOLDER% +cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl*.lib %APPVEYOR_BUILD_FOLDER% + +dir %APPVEYOR_BUILD_FOLDER%\ cmake --build . --config Release cd .. diff --git a/ci/docker/manylinux/Dockerfile.aarch64 b/ci/docker/manylinux/Dockerfile.aarch64 index a477015..837a2cc 100644 --- a/ci/docker/manylinux/Dockerfile.aarch64 +++ b/ci/docker/manylinux/Dockerfile.aarch64 @@ -19,7 +19,7 @@ ENV OPENSSL openssl-3.4.0 ENV SYSTEM_LIBSSH2 1 ENV LIBSSH2_VERSION 1.11.1 -RUN yum install zlib-devel -y +RUN yum install zlib-devel perl-IPC-Cmd -y ADD libssh2-${LIBSSH2_VERSION}.tar.gz libssh2-${LIBSSH2_VERSION}.tar.gz ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz