admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the hang issue in Travis CI build triggered by the [Feature] tag (#4536)

Browse Source 
* Fix the hang issue in Travis CI build triggered by the [Feature] tag

* [Feature] Update badge only in daily build

* [Feature] Use the term 'daily build'
This commit is contained in:
Dongbo Wang
2017-08-09 14:01:52 -07:00
committed by Aditya Patwardhan
parent 47a5a4d8ba
commit 5d53bd373a
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/powershell/Language/Classes/Scripting.Classes.BasicParsing.Tests.ps1
+4 -4
View File
@@ -7,15 +7,15 @@ try {
# CrossGen'ed assemblies cause a hang to happen intermittently when running this test suite in Linux and OSX.
# The issue has been reported to CoreCLR team. We need to work around it for now with the following approach:
# 1. For pull request and push commit, build without '-CrossGen' and run the parsing tests
# 2. For nightly build, build with '-CrossGen' but don't run the parsing tests
# In this way, we will continue to exercise these parsing tests for each CI build, and skip them for nightly
# 2. For daily build, build with '-CrossGen' but don't run the parsing tests
# In this way, we will continue to exercise these parsing tests for each CI build, and skip them for daily
# build to avoid a hang.
# Note: this change should be reverted once the 'CrossGen' issue is fixed by CoreCLR. The issue is tracked by
# https://github.com/dotnet/coreclr/issues/9745
#
$isFullBuild = $env:TRAVIS_EVENT_TYPE -eq 'cron' -or $env:TRAVIS_EVENT_TYPE -eq 'api'
$isDailyBuild = $env:TRAVIS_EVENT_TYPE -eq 'cron' -or $env:TRAVIS_EVENT_TYPE -eq 'api'
$defaultParamValues = $PSdefaultParameterValues.Clone()
$IsSkipped = (!$IsWindows -and $isFullBuild)
$IsSkipped = (!$IsWindows -and $isDailyBuild)
$PSDefaultParameterValues["it:skip"] = $IsSkipped
$PSDefaultParameterValues["ShouldBeParseError:SkipInTravisFullBuild"] = $IsSkipped
test/powershell/Language/Classes/scripting.Classes.inheritance.tests.ps1
+22
View File
@@ -2,6 +2,24 @@
# Copyright (c) Microsoft Corporation, 2015
#
try {
#
# CrossGen'ed assemblies cause a hang to happen intermittently when running this test suite in Linux and OSX.
# The issue has been reported to CoreCLR team. We need to work around it for now with the following approach:
# 1. For pull request and push commit, build without '-CrossGen' and run the parsing tests
# 2. For daily build, build with '-CrossGen' but don't run the parsing tests
# In this way, we will continue to exercise these parsing tests for each CI build, and skip them for daily
# build to avoid a hang.
# Note: this change should be reverted once the 'CrossGen' issue is fixed by CoreCLR. The issue is tracked by
# https://github.com/dotnet/coreclr/issues/9745
#
$isDailyBuild = $env:TRAVIS_EVENT_TYPE -eq 'cron' -or $env:TRAVIS_EVENT_TYPE -eq 'api'
$defaultParamValues = $PSdefaultParameterValues.Clone()
$IsSkipped = (!$IsWindows -and $isDailyBuild)
$PSDefaultParameterValues["it:skip"] = $IsSkipped
$PSDefaultParameterValues["ShouldBeParseError:SkipInTravisFullBuild"] = $IsSkipped
Describe 'Classes inheritance syntax' -Tags "CI" {
It 'Base types' {
@@ -521,3 +539,7 @@ class Derived : Base
$sb.Invoke() | Should Be 200
}
}
} finally {
$global:PSdefaultParameterValues = $defaultParamValues
}
tools/travis.ps1
+7 -4
View File
@@ -110,7 +110,9 @@ else
# Run a full build if the build was trigger via cron, api or the commit message contains `[Feature]`
$isFullBuild = $env:TRAVIS_EVENT_TYPE -eq 'cron' -or $env:TRAVIS_EVENT_TYPE -eq 'api' -or $commitMessage -match '\[feature\]'
$hasFeatureTag = $commitMessage -match '\[feature\]'
$isDailyBuild = $env:TRAVIS_EVENT_TYPE -eq 'cron' -or $env:TRAVIS_EVENT_TYPE -eq 'api'
$isFullBuild = $isDailyBuild -or $hasFeatureTag
if($Bootstrap.IsPresent)
{
@@ -140,7 +142,8 @@ else
$originalProgressPreference = $ProgressPreference
$ProgressPreference = 'SilentlyContinue'
try {
Start-PSBuild -CrossGen:$isFullBuild -PSModuleRestore
## We use CrossGen build to run tests only if it's the daily build.
Start-PSBuild -CrossGen:$isDailyBuild -PSModuleRestore
}
finally{
$ProgressPreference = $originalProgressPreference
@@ -167,7 +170,7 @@ else
if (-not $isPr) {
# Run 'CrossGen' for push commit, so that we can generate package.
# It won't rebuild powershell, but only CrossGen the already built assemblies.
if (-not $isFullBuild) { Start-PSBuild -CrossGen }
if (-not $isDailyBuild) { Start-PSBuild -CrossGen }
$packageParams = @{}
if($env:TRAVIS_BUILD_NUMBER)
@@ -196,7 +199,7 @@ else
$resultError = $_
$result = "FAIL"
}
if ( $isFullBuild ) {
if ( $isDailyBuild ) {
# now update the badge if you've done a full build, these are not fatal issues
try {
$svgData = Get-DailyBadge -result $result