From 4e65ce52abae7aef92f47105566786e072af05ac Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Sat, 22 Aug 2020 22:23:59 -0700
Subject: Sort file lists and failure logs together. (#13067)

---
 scripts/azure-pipelines/linux/azure-pipelines.yml   | 12 +++++-------
 scripts/azure-pipelines/osx/azure-pipelines.yml     | 14 +++++---------
 scripts/azure-pipelines/windows/azure-pipelines.yml | 11 +++++------
 3 files changed, 15 insertions(+), 22 deletions(-)

(limited to 'scripts')

diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml
index 969348980..054197504 100644
--- a/scripts/azure-pipelines/linux/azure-pipelines.yml
+++ b/scripts/azure-pipelines/linux/azure-pipelines.yml
@@ -33,7 +33,7 @@ jobs:
     displayName: 'Build vcpkg'
     inputs:
       filePath: bootstrap-vcpkg.sh
-      arguments: "-buildTests"
+      arguments: '-buildTests'
   - bash: toolsrc/build.rel/vcpkg-test
     displayName: 'Run vcpkg tests'
   - task: PowerShell@2
@@ -47,20 +47,18 @@ jobs:
     displayName: 'Report on Disk Space After Build'
     condition: always()
   - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: x86-linux Build Failure Logs'
+    displayName: 'Publish Artifact: failure logs for x64-linux'
     inputs:
       PathtoPublish: '$(System.ArtifactsDirectory)/failure-logs'
-      ArtifactName: 'x64-linux port build failure logs'
+      ArtifactName: 'failure logs for x64-linux'
     condition: failed()
   - bash: |
       python3 scripts/file_script.py /mnt/vcpkg-ci/installed/vcpkg/info/
     displayName: 'Build a file list for all packages'
     condition: always()
-
   - task: PublishBuildArtifacts@1
-    displayName: 'Upload file lists for all packages'
+    displayName: 'Publish Artifact: file lists for x64-linux'
     condition: always()
-
     inputs:
       PathtoPublish: scripts/list_files
-      ArtifactName: "x64-linux package file lists"
+      ArtifactName: 'file lists for x64-linux'
diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml
index 6e48238a7..0856aada7 100644
--- a/scripts/azure-pipelines/osx/azure-pipelines.yml
+++ b/scripts/azure-pipelines/osx/azure-pipelines.yml
@@ -17,10 +17,8 @@ jobs:
     value: /Users/vagrant/Data/downloads
 
   steps:
-  - bash: |
-      df -h
+  - bash: df -h
     displayName: 'Report on Disk Space'
-    condition: always()
   - bash: |
       brew list autoconf || brew install autoconf
       brew list automake || brew install automake
@@ -59,20 +57,18 @@ jobs:
     displayName: 'Report on Disk Space After Build'
     condition: always()
   - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: x64-osx port build failure logs'
+    displayName: 'Publish Artifact: failure logs for x64-osx'
     inputs:
       PathtoPublish: '$(System.ArtifactsDirectory)/failure-logs'
-      ArtifactName: 'x64-osx port build failure logs'
+      ArtifactName: 'failure logs for x64-osx'
     condition: failed()
   - bash: |
       python3 scripts/file_script.py /Users/vagrant/Data/installed/vcpkg/info/
     displayName: 'Build a file list for all packages'
     condition: always()
-
   - task: PublishBuildArtifacts@1
-    displayName: 'Upload file lists for all packages'
+    displayName: 'Publish Artifact: file lists for x64-osx'
     condition: always()
-
     inputs:
       PathtoPublish: scripts/list_files
-      ArtifactName: "x64-osx package file lists"
+      ArtifactName: 'file lists for x64-osx'
diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml
index 340138e12..09a95a519 100644
--- a/scripts/azure-pipelines/windows/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows/azure-pipelines.yml
@@ -61,23 +61,22 @@ jobs:
     inputs:
       filePath: 'scripts/azure-pipelines/windows/disk-space.ps1'
   - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: ${{ parameters.triplet }} port build failure logs'
+    displayName: 'Publish Artifact: failure logs for ${{ parameters.triplet }}'
     inputs:
       PathtoPublish: '$(System.ArtifactsDirectory)\failure-logs'
-      ArtifactName: '${{ parameters.triplet }} port build failure logs'
+      ArtifactName: 'failure logs for ${{ parameters.triplet }}'
     condition: failed()
   - task: PowerShell@2
-    displayName: "Generating all packages files"
+    displayName: 'Build a file list for all packages'
     condition: always()
-
     inputs:
       targetType: inline
       script: |
         ./vcpkg.exe fetch python3
         & $(.\vcpkg fetch python3) .\scripts\file_script.py D:\installed\vcpkg\info\
   - task: PublishBuildArtifacts@1
-    displayName: 'Upload file lists for all packages'
+    displayName: 'Publish Artifact: file lists for ${{ parameters.triplet }}'
     condition: always()
     inputs:
       PathtoPublish: scripts/list_files
-      ArtifactName: "${{ parameters.triplet }} package file lists"
+      ArtifactName: 'file lists for ${{ parameters.triplet }}'
-- 
cgit v1.2.3