Skip to content

Commit af2f647

Browse files
author
John Luo
authored
Run signcheck if previous steps succeeded an try publishing build artifacts before uploading test results (#11237)
1 parent a79bb2a commit af2f647

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

.azure/pipelines/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,11 @@ jobs:
126126
/bl:artifacts/log/build.signcheck.binlog
127127
$(_BuildArgs)
128128
displayName: Run sign check
129-
condition: eq(variables['_SignType'], 'real')
129+
condition: and(succeeded(), eq(variables['_SignType'], 'real'))
130130

131131
artifacts:
132+
- name: Windows_Logs
133+
path: artifacts/log/
132134
- name: Windows_Packages
133135
path: artifacts/packages/
134136
- name: Windows_VSIX
@@ -137,8 +139,6 @@ jobs:
137139
path: artifacts/manifests/
138140
- name: Windows_Installers
139141
path: artifacts/installers/
140-
- name: Windows_Logs
141-
path: artifacts/log/
142142
publishOnError: true
143143

144144
# Build Windows ARM

.azure/pipelines/jobs/default-build.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,23 @@ jobs:
191191
continueOnError: true
192192
condition: always()
193193

194+
- ${{ each artifact in parameters.artifacts }}:
195+
- task: PublishBuildArtifacts@1
196+
displayName: Upload artifacts from ${{ artifact.path }}
197+
condition: and(or(succeeded(), eq('${{ artifact.publishOnError }}', 'true')), or(eq(variables['system.pullrequest.isfork'], false), eq('${{ artifact.includeForks }}', 'true')))
198+
continueOnError: true
199+
inputs:
200+
${{ if eq(parameters.buildDirectory, '') }}:
201+
pathtoPublish: ${{ artifact.path }}
202+
${{ if ne(parameters.buildDirectory, '') }}:
203+
pathtoPublish: ${{ parameters.buildDirectory }}\${{ artifact.path }}
204+
${{ if eq(artifact.name, '') }}:
205+
artifactName: artifacts-$(AgentOsName)-$(BuildConfiguration)
206+
${{ if ne(artifact.name, '') }}:
207+
artifactName: ${{ artifact.name }}
208+
artifactType: Container
209+
parallel: true
210+
194211
- task: PublishTestResults@2
195212
displayName: Publish test results
196213
condition: always()
@@ -218,22 +235,6 @@ jobs:
218235
testResultsFiles: '**/TEST-com.microsoft.signalr*.xml'
219236
buildConfiguration: $(BuildConfiguration)
220237
buildPlatform: $(AgentOsName)
221-
- ${{ each artifact in parameters.artifacts }}:
222-
- task: PublishBuildArtifacts@1
223-
displayName: Upload artifacts from ${{ artifact.path }}
224-
condition: and(or(succeeded(), eq('${{ artifact.publishOnError }}', 'true')), or(eq(variables['system.pullrequest.isfork'], false), eq('${{ artifact.includeForks }}', 'true')))
225-
continueOnError: true
226-
inputs:
227-
${{ if eq(parameters.buildDirectory, '') }}:
228-
pathtoPublish: ${{ artifact.path }}
229-
${{ if ne(parameters.buildDirectory, '') }}:
230-
pathtoPublish: ${{ parameters.buildDirectory }}\${{ artifact.path }}
231-
${{ if eq(artifact.name, '') }}:
232-
artifactName: artifacts-$(AgentOsName)-$(BuildConfiguration)
233-
${{ if ne(artifact.name, '') }}:
234-
artifactName: ${{ artifact.name }}
235-
artifactType: Container
236-
parallel: true
237238

238239
- ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows')) }}:
239240
- task: MicroBuildCleanup@1

0 commit comments

Comments
 (0)