From ec83140e00e177e1de0e70e099ebf5ce5ba40007 Mon Sep 17 00:00:00 2001 From: James South Date: Fri, 27 Mar 2015 00:57:12 +0000 Subject: [PATCH] Tweaking params Former-commit-id: 8de1bcc0962694f13f1bbe6b5728595256de7452 Former-commit-id: 4f6759fafe9964eb807bcbc369cc374575f81eb9 Former-commit-id: 98439d086fe1a8fc05e627141889193fec568136 --- appveyor.yml | 2 +- build/build.ps1 | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4258ac2d8b..6428c40c0e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,7 +35,7 @@ before_build: - ps: Import-Module .\build\psake.psm1 build_script: - - ps: Invoke-Psake .\build\build.ps1 -properties @{"BuildNumber"=$env:APPVEYOR_BUILD_NUMBER;"IsAppVeyor"=$env:APPVEYOR} + - ps: Invoke-Psake .\build\build.ps1 -properties @{"BuildNumber"=$env:APPVEYOR_BUILD_NUMBER;"AppVeyor"=$env:APPVEYOR;CoverallsRepoToken$env:COVERALLS_REPO_TOKEN} #---------------------------------# # tests configuration # diff --git a/build/build.ps1 b/build/build.ps1 index f09c5b9c04..dabfbc559f 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -5,7 +5,8 @@ Properties { # see appveyor.yml for usage $BuildNumber = $null - $IsAppVeyor = $null + $CoverallsRepoToken = $null + $AppVeyor = $null # Input and output paths $BUILD_PATH = Resolve-Path "." @@ -154,7 +155,7 @@ task Run-Coverage -depends Build-Tests { $CoverageOutputPath = Join-Path $TEST_RESULTS "$($_)_Coverage.xml" $appVeyor = "" - if ($IsAppVeyor) { + if ($AppVeyor -ne $null -and $AppVeyor -ne "") { $appVeyor = " -appveyor" } @@ -165,7 +166,7 @@ task Run-Coverage -depends Build-Tests { Write-Host "Transforming coverage results file to HTML" & $REPORTGEN_EXE -verbosity:Info -reports:$CoverageOutputPath -targetdir:(Join-Path $TEST_RESULTS "Coverage\$_") - if ($env:COVERALLS_REPO_TOKEN -ne $null) { + if ($CoverallsRepoToken -ne $null -and $CoverallsRepoToken -ne "") { Write-Host "Uploading coverage report to Coveralls.io" Exec { . $COVERALLS_EXE --opencover $CoverageOutputPath } }