From 9be5ba09fdcb3d63f3356843c3dfdc3496b641b6 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Thu, 17 Aug 2017 07:48:54 +0100 Subject: [PATCH] skip tests in build on CI server as they are ran from CodeCoverage.cmd --- .gitignore | 1 + build.cmd | 6 ++++-- tests/CodeCoverage/CodeCoverage.cmd | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9157c43ae..c2a0cfa79 100644 --- a/.gitignore +++ b/.gitignore @@ -217,3 +217,4 @@ artifacts/ **/CodeCoverage/* docs/ /samples/AvatarWithRoundedCorner/output +/ImageSharp.Coverage.xml diff --git a/build.cmd b/build.cmd index fd2639da0..54be94089 100644 --- a/build.cmd +++ b/build.cmd @@ -12,8 +12,10 @@ ECHO Building nuget packages dotnet build -c Release %versionCommand% if not "%errorlevel%"=="0" goto failure -dotnet test ./tests/ImageSharp.Tests/ImageSharp.Tests.csproj --no-build -if not "%errorlevel%"=="0" goto failure +if not %CI% == "True" ( + dotnet test ./tests/ImageSharp.Tests/ImageSharp.Tests.csproj --no-build + if not "%errorlevel%"=="0" goto failure +) dotnet pack ./src/ImageSharp/ -c Release --output ../../artifacts --no-build %versionCommand% if not "%errorlevel%"=="0" goto failure diff --git a/tests/CodeCoverage/CodeCoverage.cmd b/tests/CodeCoverage/CodeCoverage.cmd index 571138f69..2c13cfc14 100644 --- a/tests/CodeCoverage/CodeCoverage.cmd +++ b/tests/CodeCoverage/CodeCoverage.cmd @@ -10,7 +10,7 @@ cd .. dotnet restore ImageSharp.sln rem The -threshold options prevents this taking ages... -tests\CodeCoverage\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"dotnet.exe" -targetargs:"test tests\ImageSharp.Tests\ImageSharp.Tests.csproj -c release /p:codecov=true" -register:user -threshold:10 -oldStyle -safemode:off -output:.\ImageSharp.Coverage.xml -hideskipped:All -returntargetcode -filter:"+[SixLabors.ImageSharp*]*" +tests\CodeCoverage\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"dotnet.exe" -targetargs:"test tests\ImageSharp.Tests\ImageSharp.Tests.csproj -c Release /p:codecov=true" -register:user -threshold:10 -oldStyle -safemode:off -output:.\ImageSharp.Coverage.xml -hideskipped:All -returntargetcode -filter:"+[SixLabors.ImageSharp*]*" if %errorlevel% neq 0 exit /b %errorlevel%