From cd3cc79cc675de8a0f037beb6220a44466eacca2 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 25 Mar 2019 00:19:55 +0100 Subject: [PATCH] Fix AppVeyor integration --- .appveyor.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 5c839632c6..377860afe9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -40,15 +40,13 @@ build_script: Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` throw "There are newer queued builds for this pull request, failing early." } - SET "PATH=%CYG_ROOT%\bin;%PATH%" - # HACK: test to see whether this prevents segfaults on 32 bit builds. - - bash -lc "python -m pip install --upgrade pip" - # gcovr install done here so it uses cygwin python we installed - - bash -lc "python -m pip install gcovr" + - python -m pip install gcovr # for coverage reporting later on - bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./etc/ci-prepare.sh" test_script: - bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./etc/ci.sh" on_success: - - bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./etc/ci-gather-coverage.sh" + # make sure to use AppVeyor's Python (not Cygwin's) in the next step + - bash -lc "export PATH="/cygdrive/c/Python27:/cygdrive/c/Python27/Scripts:$PATH" ; cd $APPVEYOR_BUILD_FOLDER && ./etc/ci-gather-coverage.sh" - bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./etc/ci-run-codecov.sh"