Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorHannes Kaeufler2020-10-25 19:57:51 +0100
committerMartin Hořeňovský2020-10-29 13:39:35 +0100
commitf797ae7a8fa0b4e2adb689e3ddd5d19efa98a099 (patch)
tree08f672ee5ea713ebf3138872289c73e822afe995
parent40b9df567f2a9ff09e3938bf2005413640eace9f (diff)
downloadcatch3-f797ae7a8fa0b4e2adb689e3ddd5d19efa98a099.tar.gz
Bump OpenCppCoverage to 0.9.9.0
Also modified the AppVeyor script to account for changes in what happens to PATH with the new installer. Closes #2059
-rw-r--r--appveyor.yml3
-rw-r--r--tools/misc/installOpenCppCoverage.ps12
2 files changed, 4 insertions, 1 deletions
diff --git a/appveyor.yml b/appveyor.yml
index e530c934..86a1df18 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,10 +18,13 @@ init:
install:
- ps: if (($env:CONFIGURATION) -eq "Debug" -And ($env:coverage) -eq "1" ) { pip --disable-pip-version-check install codecov }
+ # This removes our changes to PATH. Keep this step last!
- ps: if (($env:CONFIGURATION) -eq "Debug" -And ($env:coverage) -eq "1" ) { .\tools\misc\installOpenCppCoverage.ps1 }
before_build:
+ # We need to modify PATH again, because it was reset since the "init" step
+ - set PATH=C:\Python35;C:\Python35\Scripts;%PATH%
- set CXXFLAGS=%additional_flags%
# If we are building examples/extra-tests, we need to regenerate the amalgamated files
- cmd: if "%examples%"=="1" ( python .\tools\scripts\generateAmalgamatedFiles.py )
diff --git a/tools/misc/installOpenCppCoverage.ps1 b/tools/misc/installOpenCppCoverage.ps1
index d277a55d..215fe20e 100644
--- a/tools/misc/installOpenCppCoverage.ps1
+++ b/tools/misc/installOpenCppCoverage.ps1
@@ -1,5 +1,5 @@
# Downloads are done from the official github release page links
-$downloadUrl = "https://github.com/OpenCppCoverage/OpenCppCoverage/releases/download/release-0.9.7.0/OpenCppCoverageSetup-x64-0.9.7.0.exe"
+$downloadUrl = "https://github.com/OpenCppCoverage/OpenCppCoverage/releases/download/release-0.9.9.0/OpenCppCoverageSetup-x64-0.9.9.0.exe"
$installerPath = [System.IO.Path]::Combine($Env:USERPROFILE, "Downloads", "OpenCppCoverageSetup.exe")
if(-Not (Test-Path $installerPath)) {