Skip to content

Create codecoverage and test packages for non-windows #9373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 1 commit into from
Apr 16, 2019
Merged

Create codecoverage and test packages for non-windows #9373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .vsts-ci/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,11 @@ jobs:
parameters:
pool: Hosted Ubuntu 1604
dependsOn: linux_build

- job: CodeCovTestPackage
displayName: CodeCoverage and Test Packages
steps:
- powershell: |
Import-Module .\tools\ci.psm1
New-CodeCoverageAndTestPackage
displayName: CodeCoverage and Test Package
8 changes: 8 additions & 0 deletions .vsts-ci/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,11 @@ jobs:
parameters:
pool: 'Hosted macOS'
dependsOn: mac_build

- job: CodeCovTestPackage
displayName: CodeCoverage and Test Packages
steps:
- powershell: |
Import-Module .\tools\ci.psm1
New-CodeCoverageAndTestPackage
displayName: CodeCoverage and Test Package
2 changes: 1 addition & 1 deletion .vsts-ci/templates/windows-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ jobs:

- powershell: |
Import-Module .\tools\ci.psm1
Invoke-CIAfterTest
New-CodeCoverageAndTestPackage
Invoke-CIFinish -NuGetKey $(NUGET_KEY)
displayName: Build and Test Package
11 changes: 1 addition & 10 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,19 +638,10 @@ function New-PSOptions {
# Add .NET CLI tools to PATH
Find-Dotnet

$ConfigWarningMsg = "The passed-in Configuration value '{0}' is not supported on '{1}'. Use '{2}' instead."
if (-not $Configuration) {
$Configuration = 'Debug'
} else {
switch ($Configuration) {
"CodeCoverage" {
if(-not $Environment.IsWindows) {
$Configuration = "Debug"
Write-Warning ($ConfigWarningMsg -f $switch.Current, $Environment.LinuxInfo.PRETTY_NAME, $Configuration)
}
}
}
}

Write-Verbose "Using configuration '$Configuration'"

$PowerShellDir = if (!$Environment.IsWindows) {
Expand Down
8 changes: 1 addition & 7 deletions tools/ci.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,7 @@ function Invoke-CITest
Set-BuildVariable -Name TestPassed -Value True
}

# Implement CI 'after_test' phase
function Invoke-CIAfterTest
function New-CodeCoverageAndTestPackage
{
[CmdletBinding()]
param()
Expand Down Expand Up @@ -742,9 +741,4 @@ function New-LinuxPackage
$armPackage = Start-PSPackage @packageParams -Type tar-arm -SkipReleaseChecks
Copy-Item $armPackage -Destination "${env:BUILD_ARTIFACTSTAGINGDIRECTORY}" -Force
}

if ($isFullBuild)
{
New-TestPackage -Destination "${env:SYSTEM_ARTIFACTSDIRECTORY}"
}
}