diff options
author | Carlos Martín Nieto <cmn@dwim.me> | 2017-01-14 13:23:51 +0000 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2017-03-12 15:16:30 +0100 |
commit | c81f99cf27fd9d9f13bddc94da5bb1430bc991fb (patch) | |
tree | 1a81ffb3a7b692a80ab1676e1aa7c94593760fae | |
parent | ff9d49fea246e736e0cccf2ec4788f2cb0d047ad (diff) | |
download | libgit2-c81f99cf27fd9d9f13bddc94da5bb1430bc991fb.tar.gz |
ssh: handle libssh2 DLL path for mingw
-rw-r--r-- | appveyor.yml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index 29a6bac00..a03199da2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,13 +35,17 @@ test_script: - ps: | $ErrorActionPreference="Stop" Start-FileDownload https://github.com/ethomson/poxyproxy/releases/download/v0.1.0/poxyproxy-0.1.0.jar -FileName poxyproxy.jar + if ($env:GENERATOR -eq "MSYS Makefiles") { + Set-Variable -Name "libssh2_target" -Value $Env:APPVEYOR_BUILD_FOLDER\build + } else { + Set-Variable -Name "libssh2_target" -Value $Env:APPVEYOR_BUILD_FOLDER\build\Debug + } if ($env:ARCH -eq "64") { - curl https://dl.bintray.com/libgit2/compiled-binaries/win64/libssh2.dll -OutFile $Env:APPVEYOR_BUILD_FOLDER\build\Debug\libssh2.dll + curl https://dl.bintray.com/libgit2/compiled-binaries/win64/libssh2.dll -OutFile $libssh2_target\libssh2.dll } else { - curl https://dl.bintray.com/libgit2/compiled-binaries/libssh2.dll -OutFile $Env:APPVEYOR_BUILD_FOLDER\build\Debug\libssh2.dll + curl https://dl.bintray.com/libgit2/compiled-binaries/libssh2.dll -OutFile $libssh2_target\libssh2.dll } ls - ls Debug # Run this early so we know it's ready by the time we need it $proxyJob = Start-Job { java -jar $Env:APPVEYOR_BUILD_FOLDER\build\poxyproxy.jar -d --port 8080 --credentials foo:bar } ctest -V -R libgit2_clar |