Skip to content

Commit 2638df7

Browse files
committed
CI: download the proxy jar also on mingw
We were downloading the jar from within an block which only runs for MSVC. Move the download to the start of the test so it gets downloaded for both.
1 parent b835323 commit 2638df7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

appveyor.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,20 @@ build_script:
2727
if ($env:GENERATOR -ne "MSYS Makefiles") {
2828
cmake -D ENABLE_TRACE=ON -D BUILD_CLAR=ON -D MSVC_CRTDBG=ON .. -G"$env:GENERATOR"
2929
cmake --build . --config Debug
30-
Invoke-WebRequest https://github.com/ethomson/poxyproxy/releases/download/v0.1.0/poxyproxy-0.1.0.jar -OutFile poxyproxy.jar
3130
}
3231
- cmd: |
3332
if "%GENERATOR%"=="MSYS Makefiles" (C:\MinGW\msys\1.0\bin\sh --login /c/projects/libgit2/script/appveyor-mingw.sh)
3433
test_script:
3534
- ps: |
3635
$ErrorActionPreference="Stop"
36+
Invoke-WebRequest https://github.com/ethomson/poxyproxy/releases/download/v0.1.0/poxyproxy-0.1.0.jar -OutFile poxyproxy.jar
3737
# Run this early so we know it's ready by the time we need it
38-
Start-Job { java -jar $Env:APPVEYOR_BUILD_FOLDER\build\poxyproxy.jar -d --port 8080 --credentials foo:bar }
38+
$proxyJob = Start-Job { java -jar $Env:APPVEYOR_BUILD_FOLDER\build\poxyproxy.jar -d --port 8080 --credentials foo:bar }
3939
ctest -V -R libgit2_clar
4040
$env:GITTEST_REMOTE_URL="https://github.com/libgit2/non-existent"
4141
$env:GITTEST_REMOTE_USER="libgit2test"
4242
ctest -V -R libgit2_clar-cred_callback
43+
Receive-Job -Job $proxyJob
4344
$env:GITTEST_REMOTE_PROXY_URL = "http://foo:bar@localhost:8080"
4445
ctest -V -R libgit2_clar-proxy_credentials_in_url
4546
$env:GITTEST_REMOTE_PROXY_URL = "http://localhost:8080"

0 commit comments

Comments
 (0)