diff --git a/appveyor.yml b/appveyor.yml index 1bc42fd17f..963fced591 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,10 +8,7 @@ environment: secure: lJNGAXwiB5HlWdthz3K4PetqpTG5IEAyRgKaiKxFMQ8HW8CcOjRtB97B05op7BsK TGS_RELEASE_NOTES_TOKEN: secure: lJNGAXwiB5HlWdthz3K4PetqpTG5IEAyRgKaiKxFMQ8HW8CcOjRtB97B05op7BsK - APPVEYOR_RDP_PASSWORD: Asdf1234 -init: - - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) branches: only: - master @@ -41,7 +38,6 @@ services: install: - choco install doxygen.install codecov graphviz.portable opencover.portable - nuget restore tgstation-server.sln - - ps: build/InstallCodeCoverage.ps1 - ps: Install-Product node 10 build: project: tgstation-server.sln @@ -62,7 +58,7 @@ test_script: - ps: $wc = New-Object 'System.Net.WebClient' - ps: $wc.UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\tests\Tgstation.Server.Host.Console.Tests\TestResults\results.trx)) - set path=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\TestAgent\Common7\IDE\CommonExtensions\Microsoft\TestWindow;%path% - - vstest.console /logger:trx;LogFileName=results.trx "tests\Tgstation.Server.Host.Service.Tests\bin\%CONFIGURATION%\net471\Tgstation.Server.Host.Service.Tests.dll" /Enablecodecoverage /inIsolation /Platform:x64 + - vstest.console /logger:trx;LogFileName=results.trx "tests\Tgstation.Server.Host.Service.Tests\bin\%CONFIGURATION%\net471\Tgstation.Server.Host.Service.Tests.dll" /inIsolation /Platform:x64 - ps: $wc = New-Object 'System.Net.WebClient' - ps: $wc.UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\TestResults\results.trx)) - OpenCover.Console.exe -returntargetcode -register:user -target:"C:/Program Files/dotnet/dotnet.exe" -targetargs:"test -c %CONFIGURATION% --logger:trx;LogFileName=results.trx /p:DebugType=full tests/Tgstation.Server.Host.Watchdog.Tests/Tgstation.Server.Host.Watchdog.Tests.csproj" -filter:"+[Tgstation.Server*]* -[Tgstation.Server.Host.Watchdog.Tests*]*" -output:".\watchdog_coverage.xml" -oldstyle diff --git a/build/InstallCodeCoverage.ps1 b/build/InstallCodeCoverage.ps1 deleted file mode 100644 index ba8d78779c..0000000000 --- a/build/InstallCodeCoverage.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -New-Item -Type Directory -Force -Path "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Team Tools\Dynamic Code Coverage Tools" - -mkdir C:\CodeCoverage -pushd C:\CodeCoverage -nuget install Microsoft.CodeCoverage -Version 16.4.0 -cmd /c mklink "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Team Tools\Dynamic Code Coverage Tools\CodeCoverage.exe" "Microsoft.CodeCoverage.16.4.0\build\netstandard1.0\CodeCoverage\CodeCoverage.exe" -popd - diff --git a/build/UploadCoverage.ps1 b/build/UploadCoverage.ps1 index 34823a65d7..a74244feee 100644 --- a/build/UploadCoverage.ps1 +++ b/build/UploadCoverage.ps1 @@ -1,14 +1,7 @@ -$coverageFilePaths = Get-ChildItem -Path TestResults -Filter *.coverage -Recurse -ErrorAction SilentlyContinue -Force | %{ $_.fullname } - -$coverageFilePathList = [string]$coverageFilePaths - -Write-Host "Running CodeCoverage.exe on $coverageFilePathList" -&"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Team Tools\Dynamic Code Coverage Tools\CodeCoverage.exe" analyze /output:service.coveragexml "$coverageFilePathList" - codecov -f api_coverage.xml --flag unittests codecov -f client_coverage.xml --flag unittests codecov -f host_coverage.xml --flag unittests codecov -f console_coverage.xml --flag unittests codecov -f watchdog_coverage.xml --flag unittests -codecov -f service.coveragexml --flag unittests +#codecov -f service.coveragexml --flag unittests codecov -f server_coverage.xml --flag integration