Skip to content

Commit 6aaa98c

Browse files
committed
[ci] Upload test assemblies after signing
We've recently seen a handful of build timeouts and/or failures during signing. The ESRP signing service seems to be much less performant and more error prone on macOS. In these failure cases, rebuild attempts would also fail when they got to the "upload test assembly step": [error]Artifact test-assemblies already exists for build 6522654. Improve this by uploading test assemblies and build inventory data at the end of the build, and by increasing the overall timeout of the job.
1 parent ae178fa commit 6aaa98c

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

build-tools/automation/yaml-templates/commercial-build.yaml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,29 +49,11 @@ steps:
4949
workingDirectory: ${{ parameters.xaSourcePath }}
5050
displayName: make jenkins
5151

52-
- task: PublishPipelineArtifact@1
53-
displayName: upload build tools inventory
54-
inputs:
55-
artifactName: BuildToolsInventory
56-
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/buildtoolsinventory.csv
57-
58-
# Build and package test assemblies
52+
# Build test assemblies
5953
- script: make all-tests CONFIGURATION=$(XA.Build.Configuration)
6054
workingDirectory: ${{ parameters.xaSourcePath }}
6155
displayName: make all-tests
6256

63-
- script: >
64-
cp -r bin/$(XA.Build.Configuration)/bcl-tests bin/Test$(XA.Build.Configuration)/bcl-tests &&
65-
cp bin/Build$(XA.Build.Configuration)/ProfileAssemblies.projitems bin/Test$(XA.Build.Configuration)/bcl-tests/
66-
workingDirectory: ${{ parameters.xaSourcePath }}
67-
displayName: copy bcl-tests assemblies
68-
69-
- task: PublishPipelineArtifact@1
70-
displayName: upload test assemblies
71-
inputs:
72-
artifactName: $(TestAssembliesArtifactName)
73-
targetPath: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)
74-
7557
# Restore needs to be executed first or MicroBuild targets won't be imported in time
7658
- task: MSBuild@1
7759
displayName: msbuild /t:Restore sign-content.proj
@@ -119,3 +101,22 @@ steps:
119101
inputs:
120102
artifactName: $(InstallerArtifactName)
121103
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName)
104+
105+
# Upload test assemblies
106+
- script: >
107+
cp -r bin/$(XA.Build.Configuration)/bcl-tests bin/Test$(XA.Build.Configuration)/bcl-tests &&
108+
cp bin/Build$(XA.Build.Configuration)/ProfileAssemblies.projitems bin/Test$(XA.Build.Configuration)/bcl-tests/
109+
workingDirectory: ${{ parameters.xaSourcePath }}
110+
displayName: copy bcl-tests assemblies
111+
112+
- task: PublishPipelineArtifact@1
113+
displayName: upload test assemblies
114+
inputs:
115+
artifactName: $(TestAssembliesArtifactName)
116+
targetPath: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)
117+
118+
- task: PublishPipelineArtifact@1
119+
displayName: upload build tools inventory
120+
inputs:
121+
artifactName: BuildToolsInventory
122+
targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/buildtoolsinventory.csv

0 commit comments

Comments
 (0)