Skip to content

Commit eebcb5f

Browse files
adityapatwardhanadityapatwardhan
committed
Make windows packaging wait for tests to complete for daily builds
1 parent 42ff45e commit eebcb5f

3 files changed

Lines changed: 86 additions & 2 deletions

File tree

‎.vsts-ci/templates/windows-packaging.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
parameters:
22
pool: 'Hosted VS2017'
33
jobName: 'win_packaging'
4+
parentJobs: []
45

56
jobs:
67
- job: ${{ parameters.jobName }}
@@ -27,5 +28,5 @@ jobs:
2728
- powershell: |
2829
Import-Module .\tools\ci.psm1
2930
Invoke-CIAfterTest
30-
Invoke-CIFinish -NuGetKey $(NUGET_KEY)
31+
Invoke-CIFinish
3132
displayName: Build and Test Package

‎.vsts-ci/windows-daily.yml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
2+
trigger:
3+
# Batch merge builds together while a merge build is running
4+
batch: true
5+
branches:
6+
include:
7+
- master
8+
- release*
9+
paths:
10+
include:
11+
- '*'
12+
exclude:
13+
- /tools/releaseBuild/**/*
14+
- /.vsts-ci/misc-analysis.yml
15+
- /.github/ISSUE_TEMPLATE/*
16+
pr:
17+
branches:
18+
include:
19+
- master
20+
- release*
21+
paths:
22+
include:
23+
- '*'
24+
exclude:
25+
- /tools/releaseBuild/**/*
26+
- /.vsts-ci/misc-analysis.yml
27+
- /.github/ISSUE_TEMPLATE/*
28+
29+
variables:
30+
GIT_CONFIG_PARAMETERS: "'core.autocrlf=false'"
31+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
32+
POWERSHELL_TELEMETRY_OPTOUT: 1
33+
# Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
34+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
35+
36+
resources:
37+
- repo: self
38+
clean: true
39+
40+
jobs:
41+
- template: templates/ci-build.yml
42+
43+
- template: templates/windows-test.yml
44+
parameters:
45+
purpose: UnelevatedPesterTests
46+
tagSet: CI
47+
parentJobs:
48+
- win_build
49+
50+
- template: templates/windows-test.yml
51+
parameters:
52+
purpose: ElevatedPesterTests
53+
tagSet: CI
54+
parentJobs:
55+
- win_build
56+
57+
- template: templates/windows-test.yml
58+
parameters:
59+
purpose: UnelevatedPesterTests
60+
tagSet: Others
61+
parentJobs:
62+
- win_build
63+
64+
- template: templates/windows-test.yml
65+
parameters:
66+
purpose: ElevatedPesterTests
67+
tagSet: Others
68+
parentJobs:
69+
- win_build
70+
71+
- template: templates/windows-packaging.yml
72+
parameters:
73+
dependsOn:
74+
- win_test_UnelevatedPesterTests_CI
75+
- win_test_ElevatedPesterTests_CI
76+
- win_test_UnelevatedPesterTests_Others
77+
- win_test_ElevatedPesterTests_Others
78+
- verify_xunit
79+
80+
- template: templates/verify-xunit.yml
81+
parameters:
82+
pool: 'Hosted VS2017'
83+
dependsOn: win_build

‎tools/ci.psm1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ function Invoke-CIFinish
490490
}
491491

492492
# only publish assembly nuget packages if it is a daily build and tests passed
493-
if((Test-DailyBuild) -and $env:TestPassed -eq 'True')
493+
if(Test-DailyBuild)
494494
{
495495
Publish-NuGetFeed -OutputPath .\nuget-artifacts -ReleaseTag $preReleaseVersion
496496
$nugetArtifacts = Get-ChildItem .\nuget-artifacts -ErrorAction SilentlyContinue | ForEach-Object { $_.FullName }

0 commit comments

Comments
 (0)