@@ -21,15 +21,14 @@ parameters:
21
21
default : false
22
22
23
23
steps :
24
- # Internal pipeline: Build with pack+sign+archive
24
+ # Internal pipeline: Build with pack+sign
25
25
- ${{ if ne(parameters.runAsPublic, 'true') }} :
26
26
- script : ${{ parameters.buildScript }}
27
27
-restore -build
28
28
-pack
29
29
-sign $(_SignArgs)
30
30
-publish $(_PublishArgs)
31
31
-configuration ${{ parameters.buildConfig }}
32
- /p:ArchiveTests=true
33
32
/bl:${{ parameters.repoLogPath }}/build.binlog
34
33
$(_OfficialBuildIdArgs)
35
34
$(_InternalBuildArgs)
46
45
$(_OfficialBuildIdArgs)
47
46
displayName : Build
48
47
49
- - ${{ if or(ne(parameters.runAsPublic, 'true'), ne(parameters.runHelixTests, 'true')) }} :
48
+ # Non-helix tests are run only on the public pipeline
49
+ - ${{ if and(eq(parameters.runAsPublic, 'true'), ne(parameters.runHelixTests, 'true')) }} :
50
+ # non-helix tests
50
51
- ${{ if ne(parameters.isWindows, 'true') }} :
51
52
- script : mkdir ${{ parameters.repoArtifactsPath }}/devcert-scripts &&
52
53
cd ${{ parameters.repoArtifactsPath }}/devcert-scripts &&
73
74
74
75
displayName : Run non-helix tests
75
76
76
- - ${{ if or(ne(parameters.runAsPublic, 'true'), eq(parameters.runHelixTests, 'true')) }} :
77
+ # Helix tests are run only on the public pipeline
78
+ - ${{ if and(eq(parameters.runAsPublic, 'true'), eq(parameters.runHelixTests, 'true')) }} :
77
79
- script : ${{ parameters.buildScript }}
78
80
/p:Configuration=${{ parameters.buildConfig }}
79
81
$(_OfficialBuildIdArgs)
@@ -117,24 +119,18 @@ steps:
117
119
continueOnError : true
118
120
condition : always()
119
121
120
- - task : CopyFiles@2
121
- inputs :
122
- Contents : ' ${{ parameters.repoArtifactsPath }}/**/*.cobertura.xml'
123
- TargetFolder : ' ${{ parameters.repoArtifactsPath }}/CodeCoverage'
124
- flattenFolders : true
125
- displayName : Gather code coverage results
126
-
122
+ # Code coverage - only on public pipelines
127
123
- ${{ if eq(parameters.runAsPublic, 'true') }} :
124
+ - task : CopyFiles@2
125
+ inputs :
126
+ Contents : ' ${{ parameters.repoArtifactsPath }}/**/*.cobertura.xml'
127
+ TargetFolder : ' ${{ parameters.repoArtifactsPath }}/CodeCoverage'
128
+ flattenFolders : true
129
+ displayName : Gather code coverage results
130
+
128
131
- task : PublishPipelineArtifact@1
129
132
displayName : Publish coverage results (cobertura.xml)
130
133
inputs :
131
134
targetPath : ' ${{ parameters.repoArtifactsPath }}/CodeCoverage'
132
135
artifactName : ' $(Agent.JobName)_CodeCoverageResults'
133
136
publishLocation : ' pipeline'
134
-
135
- - ${{ if ne(parameters.runAsPublic, 'true') }} :
136
- - task : 1ES.PublishPipelineArtifact@1
137
- displayName : Publish code coverage results
138
- inputs :
139
- targetPath : ' ${{ parameters.repoArtifactsPath }}/CodeCoverage'
140
- artifactName : ' $(Agent.JobName)_CodeCoverageResults'
0 commit comments