@@ -50,11 +50,15 @@ dotnet_csproj:
5050 version : ' {version}'
5151 assembly_version : ' {version}'
5252
53+ # set up the environment variables used later in the build process
54+ environment :
55+ installer_dir : Rubberduck.Deployment\InnoSetup\Installers\
56+ codecov_token :
57+ secure : WXzsqA7du+xTCQN0p06UFYOe94bKkB1ZtyCWS0Xlsu7OwIwKIa/OPaHj8Yev1JGl
5358
5459before_build :
5560 - development/java/Rubberduck.Parsing/Grammar/gradlew.bat -p development/java/Rubberduck.Parsing/Grammar clean build
5661 - cinst innosetup -version 5.6.1
57- - cinst codecov
5862 - cinst opencover.portable
5963 - nuget restore RubberduckMeta.sln
6064 - nuget restore Rubberduck.sln
@@ -66,14 +70,15 @@ build:
6670# Otherwise we might run tests against artifacts that do not exist
6771test_script :
6872 # we use -returntargetcode to fail the build if tests fail
69- - cmd : OpenCover.Console.exe -register:user -returntargetcode -target:"nunit3-console.exe" -targetargs:".\RubberduckTests\bin\RubberduckTests.dll" -output:".\Rubberduck_Coverage.xml"
70- - cmd : OpenCover.Console.exe -register:user -returntargetcode -target:"nunit3-console.exe" -targetargs:".\RubberduckTestsCodeAnalysis\bin\RubberduckTestsCodeAnalysis.dll" -output:".\RubberduckCodeAnalysis_Coverage.xml"
7173 # when using test_script, after_test seems to not be executed
72- - cmd : codecov -f "Rubberduck_Coverage.xml RubberduckCodeAnalysis_Coverage.xml"
74+ # Manually select coverage instrumentation using "-register:Path64" to fix coverage generation
75+ - |
76+ OpenCover.Console.exe -register:Path64 -returntargetcode -target:"nunit3-console.exe" -targetargs:".\RubberduckTests\bin\RubberduckTests.dll" -output:".\Rubberduck_Coverage.xml"
77+ OpenCover.Console.exe -register:Path64 -returntargetcode -target:"nunit3-console.exe" -targetargs:".\RubberduckTestsCodeAnalysis\bin\RubberduckTestsCodeAnalysis.dll" -output:".\RubberduckCodeAnalysis_Coverage.xml"
78+ curl --silent https://codecov.io/bash --output codecov
79+ bash codecov -f Rubberduck_Coverage.xml -f RubberduckCodeAnalysis_Coverage.xml
7380
7481# Define the installer-name depending on what branch we're building on
75- environment :
76- installer_dir : Rubberduck.Deployment\InnoSetup\Installers\
7782for :
7883-
7984 branches :
@@ -116,6 +121,10 @@ artifacts:
116121 name : InspectionDocs
117122 - path : Rubberduck.Deployment\InnoSetup\Installers\*.hash
118123 name : InstallerHashes
124+ - path : Rubberduck_Coverage.xml
125+ name : MainCoverage
126+ - path : RubberduckCodeAnalysis_Coverage.xml
127+ name : AnalysisCoverage
119128deploy :
120129 - provider : GitHub
121130 tag : RETAGMEWITHAMESSAGE
0 commit comments