diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2020-07-24 22:59:17 +0200 |
|---|---|---|
| committer | Marc Hoersken <info@marc-hoersken.de> | 2020-07-31 18:55:52 +0200 |
| commit | 0fc1b8bfdd223aa20c29950442a4ddb575c9ccfe (patch) | |
| tree | e49f09e4fb11fd421766cb888c51539a52011811 | |
| parent | e574f4fda1a3ac7a593c9695af6c21eefa7c2fbe (diff) | |
| download | curl-0fc1b8bfdd223aa20c29950442a4ddb575c9ccfe.tar.gz | |
CI/azure: install libssh2 for use with msys2-based builds
This enables building and running the SFTP tests.
Unfortunately OpenSSH for Windows does not support SCP (yet).
Reviewed-by: Daniel Stenberg
Closes #5721
| -rw-r--r-- | .azure-pipelines.yml | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 3acdfb4c5..c6ca08701 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -116,14 +116,16 @@ stages: name: 32-bit OpenSSL and MQTT container_img: mback2k/curl-docker-winbuildenv-msys2-mingw32:ltsc2019 container_cmd: C:\msys64\usr\bin\sh - configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-mqtt - tflags: ~1056 ~1299 + prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2 + configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-mqtt --with-libssh2 + tflags: ~612 ~1056 ~1299 !SCP msys2_mingw64_debug_openssl: name: 64-bit OpenSSL and MQTT container_img: mback2k/curl-docker-winbuildenv-msys2-mingw64:ltsc2019 container_cmd: C:\msys64\usr\bin\sh - configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-mqtt - tflags: ~1056 ~1299 + prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2 + configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-mqtt --with-libssh2 + tflags: ~612 ~1056 ~1299 !SCP msys1_mingw_debug_openssl: name: 32-bit OpenSSL (legacy) container_img: mback2k/curl-docker-winbuildenv-msys1-mingw:ltsc2019 @@ -146,14 +148,16 @@ stages: name: 32-bit Schannel/SSPI/WinIDN container_img: mback2k/curl-docker-winbuildenv-msys2-mingw32:ltsc2019 container_cmd: C:\msys64\usr\bin\sh - configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn - tflags: ~165 ~310 ~1013 ~1056 ~1299 ~1448 ~2034 ~2037 ~2041 ~2046 ~2047 ~3000 ~3001 + prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2 + configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn --with-libssh2 + tflags: ~165 ~310 ~612 ~1013 ~1056 ~1299 ~1448 ~2034 ~2037 ~2041 ~2046 ~2047 ~3000 ~3001 !SCP msys2_mingw64_debug_schannel: name: 64-bit Schannel/SSPI/WinIDN container_img: mback2k/curl-docker-winbuildenv-msys2-mingw64:ltsc2019 container_cmd: C:\msys64\usr\bin\sh - configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn - tflags: ~165 ~310 ~1013 ~1056 ~1299 ~1448 ~2034 ~2037 ~2041 ~2046 ~2047 ~3000 ~3001 + prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2 + configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn --with-libssh2 + tflags: ~165 ~310 ~612 ~1013 ~1056 ~1299 ~1448 ~2034 ~2037 ~2041 ~2046 ~2047 ~3000 ~3001 !SCP msys1_mingw_debug_schannel: name: 32-bit Schannel/SSPI/WinIDN (legacy) container_img: mback2k/curl-docker-winbuildenv-msys1-mingw:ltsc2019 @@ -177,6 +181,10 @@ stages: env: MSYS2_PATH_TYPE: inherit steps: + - script: $(container_cmd) -l -c "cd $(echo '%cd%') && $(prepare)" + displayName: 'prepare' + condition: variables.prepare + - script: $(container_cmd) -l -c "cd $(echo '%cd%') && ./buildconf && ./configure $(configure)" displayName: 'configure $(name)' |