Improve compliance jobs (#2772)

mono · Feb 29, 2024 · d98115c · d98115c
1 parent c4d1172
commit d98115c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml
@@ -30,7 +30,6 @@ parameters:
   installLlvm: true                             # whether or not to install the LLVM compiler
   installEmsdk: false                           # whether or not to install the Emscripten SDK
   installNinja: false                           # whether or not to install the ninja build system
-  artifactName: ''                              # the name of the artifact to merge this run into
   publishArtifacts: []                          # the additional artifacts to publish
   tools: []                                     # any additional .net global tools
   skipInstall: false                            # whether or not to install any tools
@@ -57,23 +56,27 @@ jobs:
           break: false
       outputParentDirectory: 'output'
       outputs:
-        - output: pipelineArtifact
-          displayName: 'Publish the ${{ parameters.name }} artifacts'
-          condition: or(${{ parameters.shouldPublish }}, failed())
-          artifactName: ${{ parameters.name }}
-          targetPath: 'output'
-        - ${{ if ne(parameters.artifactName, '') }}:
+        - ${{ if eq(parameters.shouldPublish, 'true') }}:
           - output: pipelineArtifact
-            displayName: 'Publish the combined ${{ parameters.artifactName }} artifacts'
-            artifactName: ${{ parameters.artifactName }}
+            displayName: 'Publish the ${{ parameters.name }} artifacts'
+            artifactName: ${{ parameters.name }}
+            targetPath: 'output'
+          - output: pipelineArtifact
+            displayName: 'Publish the failed ${{ parameters.name }} artifacts'
+            condition: failed()
+            artifactName: ${{ parameters.name }}_failed_$(System.JobAttempt)
             targetPath: 'output'
         - ${{ each additionalArtifact in parameters.publishArtifacts }}:
           - output: pipelineArtifact
             displayName: 'Publish the ${{ additionalArtifact.name }} artifacts'
-            ${{ if eq(additionalArtifact.always, 'true') }}:
-              condition: always()
             artifactName: ${{ additionalArtifact.name }}
             targetPath: ${{ additionalArtifact.path }}
+          - ${{ if eq(additionalArtifact.always, 'true') }}:
+            - output: pipelineArtifact
+              displayName: 'Publish the failed ${{ additionalArtifact.name }} artifacts'
+              condition: failed()
+              artifactName: ${{ additionalArtifact.name }}_failed_$(System.JobAttempt)
+              targetPath: ${{ additionalArtifact.path }}
 
     steps:
       # prepare

diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml
@@ -916,6 +916,8 @@ stages:
           - package
         complianceEnabled: true
         complianceTimeoutInMinutes: 480
+        windowsPoolName: ${{ parameters.buildAgentHost.pool.name }}
+        windowsImageOverride: ${{ parameters.buildAgentHost.pool.image }}
         scanArtifacts:
           - nuget
           - nuget_symbols