mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-11-03 21:49:32 +01:00 
			
		
		
		
	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
This commit is contained in:
		
				
					committed by
					
						
						Martin Hořeňovský
					
				
			
			
				
	
			
			
			
						parent
						
							40b9df567f
						
					
				
				
					commit
					f797ae7a8f
				
			@@ -18,10 +18,13 @@ init:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
install:
 | 
					install:
 | 
				
			||||||
  - ps: if (($env:CONFIGURATION) -eq "Debug" -And ($env:coverage) -eq "1" ) { pip --disable-pip-version-check install codecov }
 | 
					  - 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 }
 | 
					  - ps: if (($env:CONFIGURATION) -eq "Debug" -And ($env:coverage) -eq "1" ) { .\tools\misc\installOpenCppCoverage.ps1 }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
before_build:
 | 
					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%
 | 
					  - set CXXFLAGS=%additional_flags%
 | 
				
			||||||
  # If we are building examples/extra-tests, we need to regenerate the amalgamated files
 | 
					  # If we are building examples/extra-tests, we need to regenerate the amalgamated files
 | 
				
			||||||
  - cmd: if "%examples%"=="1" ( python .\tools\scripts\generateAmalgamatedFiles.py )
 | 
					  - cmd: if "%examples%"=="1" ( python .\tools\scripts\generateAmalgamatedFiles.py )
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
# Downloads are done from the official github release page links
 | 
					# 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")
 | 
					$installerPath = [System.IO.Path]::Combine($Env:USERPROFILE, "Downloads", "OpenCppCoverageSetup.exe")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if(-Not (Test-Path $installerPath)) {
 | 
					if(-Not (Test-Path $installerPath)) {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user