huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Run signcheck if previous steps succeeded an try publishing build artifacts before uploading test results (#11237)

This commit is contained in:
John Luo 2019-06-14 15:38:11 -07:00 committed by GitHub
parent a79bb2a79d
commit af2f647d63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.azure/pipelines/ci.yml
View File

@ -126,9 +126,11 @@ jobs:
/bl:artifacts/log/build.signcheck.binlog /bl:artifacts/log/build.signcheck.binlog
$(_BuildArgs) $(_BuildArgs)
displayName: Run sign check displayName: Run sign check
condition: eq(variables['_SignType'], 'real') condition: and(succeeded(), eq(variables['_SignType'], 'real'))
artifacts: artifacts:
- name: Windows_Logs
path: artifacts/log/
- name: Windows_Packages - name: Windows_Packages
path: artifacts/packages/ path: artifacts/packages/
- name: Windows_VSIX - name: Windows_VSIX
@ -137,8 +139,6 @@ jobs:
path: artifacts/manifests/ path: artifacts/manifests/
- name: Windows_Installers - name: Windows_Installers
path: artifacts/installers/ path: artifacts/installers/
- name: Windows_Logs
path: artifacts/log/
publishOnError: true publishOnError: true
# Build Windows ARM # Build Windows ARM

33
.azure/pipelines/jobs/default-build.yml
View File

@ -191,6 +191,23 @@ jobs:
continueOnError: true continueOnError: true
condition: always() condition: always()
- ${{ each artifact in parameters.artifacts }}:
- task: PublishBuildArtifacts@1
displayName: Upload artifacts from ${{ artifact.path }}
condition: and(or(succeeded(), eq('${{ artifact.publishOnError }}', 'true')), or(eq(variables['system.pullrequest.isfork'], false), eq('${{ artifact.includeForks }}', 'true')))
continueOnError: true
inputs:
${{ if eq(parameters.buildDirectory, '') }}:
pathtoPublish: ${{ artifact.path }}
${{ if ne(parameters.buildDirectory, '') }}:
pathtoPublish: ${{ parameters.buildDirectory }}\${{ artifact.path }}
${{ if eq(artifact.name, '') }}:
artifactName: artifacts-$(AgentOsName)-$(BuildConfiguration)
${{ if ne(artifact.name, '') }}:
artifactName: ${{ artifact.name }}
artifactType: Container
parallel: true
- task: PublishTestResults@2 - task: PublishTestResults@2
displayName: Publish test results displayName: Publish test results
condition: always() condition: always()
@ -218,22 +235,6 @@ jobs:
testResultsFiles: '**/TEST-com.microsoft.signalr*.xml' testResultsFiles: '**/TEST-com.microsoft.signalr*.xml'
buildConfiguration: $(BuildConfiguration) buildConfiguration: $(BuildConfiguration)
buildPlatform: $(AgentOsName) buildPlatform: $(AgentOsName)
- ${{ each artifact in parameters.artifacts }}:
- task: PublishBuildArtifacts@1
displayName: Upload artifacts from ${{ artifact.path }}
condition: and(or(succeeded(), eq('${{ artifact.publishOnError }}', 'true')), or(eq(variables['system.pullrequest.isfork'], false), eq('${{ artifact.includeForks }}', 'true')))
continueOnError: true
inputs:
${{ if eq(parameters.buildDirectory, '') }}:
pathtoPublish: ${{ artifact.path }}
${{ if ne(parameters.buildDirectory, '') }}:
pathtoPublish: ${{ parameters.buildDirectory }}\${{ artifact.path }}
${{ if eq(artifact.name, '') }}:
artifactName: artifacts-$(AgentOsName)-$(BuildConfiguration)
${{ if ne(artifact.name, '') }}:
artifactName: ${{ artifact.name }}
artifactType: Container
parallel: true
- ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows')) }}: - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows')) }}:
- task: MicroBuildCleanup@1 - task: MicroBuildCleanup@1