From 58b91b72128c9bf7fc1d2927121d39a00737167f Mon Sep 17 00:00:00 2001 From: OCram85 Date: Mon, 5 Mar 2018 08:43:06 +0100 Subject: [PATCH 1/4] skip coverage report for PRs --- tools/AppVeyor.psm1 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/AppVeyor.psm1 b/tools/AppVeyor.psm1 index de78763..7cdebf0 100644 --- a/tools/AppVeyor.psm1 +++ b/tools/AppVeyor.psm1 @@ -153,13 +153,17 @@ Function Invoke-CoverageReport() { [ValidateNotNullOrEmpty()] [String]$RepoToken = $Env:CoverallsToken ) - - Import-Module ('.\src\{0}.psm1' -f $CALLSIGN) -Verbose -Force - $FileMap = New-PesterFileMap -SourceRoot '.\src' -PesterRoot '.\tests' - $CoverageReport = New-CoverageReport -PesterFileMap $FileMap -RepoToken $RepoToken - Write-Host "CoverageReport JSON:" -ForegroundColor Yellow - $CoverageReport | Out-String | Write-Host - Publish-CoverageReport -CoverageReport $CoverageReport + if ( $null -ne $RepoToken) { + Import-Module ('.\src\{0}.psm1' -f $CALLSIGN) -Verbose -Force + $FileMap = New-PesterFileMap -SourceRoot '.\src' -PesterRoot '.\tests' + $CoverageReport = New-CoverageReport -PesterFileMap $FileMap -RepoToken $RepoToken + Write-Host "CoverageReport JSON:" -ForegroundColor Yellow + $CoverageReport | Out-String | Write-Host + Publish-CoverageReport -CoverageReport $CoverageReport + } + else { + Write-Warning 'CoverallsToken var given but empty. This run is triggered by a PR. Skipping coverage report...' + } } Function Invoke-AppVeyorPSGallery() { -- 2.40.1 From d45e42c2b1859d49ffe817cdef9b711c15aba39f Mon Sep 17 00:00:00 2001 From: OCram85 Date: Mon, 5 Mar 2018 08:52:51 +0100 Subject: [PATCH 2/4] Revert "skip coverage report for PRs" This reverts commit 58b91b72128c9bf7fc1d2927121d39a00737167f. --- tools/AppVeyor.psm1 | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/tools/AppVeyor.psm1 b/tools/AppVeyor.psm1 index 7cdebf0..de78763 100644 --- a/tools/AppVeyor.psm1 +++ b/tools/AppVeyor.psm1 @@ -153,17 +153,13 @@ Function Invoke-CoverageReport() { [ValidateNotNullOrEmpty()] [String]$RepoToken = $Env:CoverallsToken ) - if ( $null -ne $RepoToken) { - Import-Module ('.\src\{0}.psm1' -f $CALLSIGN) -Verbose -Force - $FileMap = New-PesterFileMap -SourceRoot '.\src' -PesterRoot '.\tests' - $CoverageReport = New-CoverageReport -PesterFileMap $FileMap -RepoToken $RepoToken - Write-Host "CoverageReport JSON:" -ForegroundColor Yellow - $CoverageReport | Out-String | Write-Host - Publish-CoverageReport -CoverageReport $CoverageReport - } - else { - Write-Warning 'CoverallsToken var given but empty. This run is triggered by a PR. Skipping coverage report...' - } + + Import-Module ('.\src\{0}.psm1' -f $CALLSIGN) -Verbose -Force + $FileMap = New-PesterFileMap -SourceRoot '.\src' -PesterRoot '.\tests' + $CoverageReport = New-CoverageReport -PesterFileMap $FileMap -RepoToken $RepoToken + Write-Host "CoverageReport JSON:" -ForegroundColor Yellow + $CoverageReport | Out-String | Write-Host + Publish-CoverageReport -CoverageReport $CoverageReport } Function Invoke-AppVeyorPSGallery() { -- 2.40.1 From 8ed1f99e950258645ecdc486c81a6aa166a9142c Mon Sep 17 00:00:00 2001 From: OCram85 Date: Mon, 5 Mar 2018 09:00:53 +0100 Subject: [PATCH 3/4] skipp coverage report creation for PRs --- appveyor.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 19b96e0..1fa7b84 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,13 @@ build_script: test_script: - ps: Invoke-AppVeyorTests - - ps: Invoke-CoverageReport + - ps: >- + if ($null -ne $Env:CoverallsToken) { + Invoke-CoverageReport + } + else { + Write-Warning "No CoverallsToken found. This build seems to be triggered by a PR. Skipping this step..." + } deploy: #- provider: GitHub -- 2.40.1 From 99b3c85124c129769020da53e37f62cfe25d3a29 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Mon, 5 Mar 2018 09:04:22 +0100 Subject: [PATCH 4/4] fix YAML syntax --- appveyor.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1fa7b84..30511a4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,13 +33,13 @@ build_script: test_script: - ps: Invoke-AppVeyorTests - - ps: >- - if ($null -ne $Env:CoverallsToken) { - Invoke-CoverageReport - } - else { - Write-Warning "No CoverallsToken found. This build seems to be triggered by a PR. Skipping this step..." - } + - ps: | + if ($null -ne $Env:CoverallsToken) { + Invoke-CoverageReport + } + else { + Write-Warning "No CoverallsToken found. This build seems to be triggered by a PR. Skipping this step..." + } deploy: #- provider: GitHub -- 2.40.1