From 9f8cc9ee88684b9dc94906ef57046bbf5e09c1d4 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Thu, 25 Jun 2020 22:19:17 -0700
Subject: [PATCH] [vcpkg] Delete unnecessary tombstone deletion step now that
 CI rebuilds everything (#12120)

---
 scripts/azure-pipelines/azure-pipelines.yml | 109 +++++++-------------
 1 file changed, 35 insertions(+), 74 deletions(-)

diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index 061a6c2de7..e18c4a354f 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -4,85 +4,46 @@
 variables:
   windows-pool: 'PrWin-2020-06-04'
   linux-pool: 'PrLin-2020-06-08'
-  delete-tombstones-first: ${{ ne(variables['Build.Reason'], 'PullRequest') }}
 
-stages:
-  - stage: delete_tombstones
-    displayName: 'Delete Tombstones'
-    jobs:
-    - job: windows
-      displayName: 'Clean Windows Tombstones'
-      pool: $(windows-pool)
-      condition: ${{ variables['delete-tombstones-first'] }}
-      steps:
-      - task: PowerShell@2
-        displayName: 'Initialize Environment'
-        inputs:
-          filePath: 'scripts/azure-pipelines/windows/initialize-environment.ps1'
-      - script: rmdir /s /q W:\fail
-        failOnStderr: false
-        displayName: 'Delete W:\fail'
-    - job: linux
-      displayName: 'Clean Linux Tombstones'
-      pool: $(linux-pool)
-      condition: ${{ variables['delete-tombstones-first'] }}
-      steps:
-      - bash: rm -rf /archives/fail
-        displayName: 'Delete /archives/fail'
-        failOnStderr: false
-    - job: osx
-      displayName: 'Clean MacOS Tombstones'
-      condition: ${{ variables['delete-tombstones-first'] }}
-      pool:
-        name: vcpkgAgentPool
-        demands: Agent.OS -equals Darwin
-      steps:
-      - bash: rm -rf /Users/vagrant/Data/archives/fail
-        displayName: 'Delete /Users/vagrant/Data/archives/fail'
-        failOnStderr: false
+jobs:
+  - template: windows/azure-pipelines.yml
+    parameters:
+      triplet: x86-windows
+      jobName: x86_windows
+      poolName: $(windows-pool)
 
-  - stage: run_pr_test
-    displayName: 'Run PR Test'
-    dependsOn: delete_tombstones
-    jobs:
-      - template: windows/azure-pipelines.yml
-        parameters:
-          triplet: x86-windows
-          jobName: x86_windows
-          poolName: $(windows-pool)
+  - template: windows/azure-pipelines.yml
+    parameters:
+      triplet: x64-windows
+      jobName: x64_windows
+      poolName: $(windows-pool)
 
-      - template: windows/azure-pipelines.yml
-        parameters:
-          triplet: x64-windows
-          jobName: x64_windows
-          poolName: $(windows-pool)
+  - template: windows/azure-pipelines.yml
+    parameters:
+      triplet: x64-windows-static
+      jobName: x64_windows_static
+      poolName: $(windows-pool)
 
-      - template: windows/azure-pipelines.yml
-        parameters:
-          triplet: x64-windows-static
-          jobName: x64_windows_static
-          poolName: $(windows-pool)
+  - template: windows/azure-pipelines.yml
+    parameters:
+      triplet: x64-uwp
+      jobName: x64_uwp
+      poolName: $(windows-pool)
 
-      - template: windows/azure-pipelines.yml
-        parameters:
-          triplet: x64-uwp
-          jobName: x64_uwp
-          poolName: $(windows-pool)
+  - template: windows/azure-pipelines.yml
+    parameters:
+      triplet: arm64-windows
+      jobName: arm64_windows
+      poolName: $(windows-pool)
 
-      - template: windows/azure-pipelines.yml
-        parameters:
-          triplet: arm64-windows
-          jobName: arm64_windows
-          poolName: $(windows-pool)
+  - template: windows/azure-pipelines.yml
+    parameters:
+      triplet: arm-uwp
+      jobName: arm_uwp
+      poolName: $(windows-pool)
 
-      - template: windows/azure-pipelines.yml
-        parameters:
-          triplet: arm-uwp
-          jobName: arm_uwp
-          poolName: $(windows-pool)
+  - template: osx/azure-pipelines.yml
 
-      - template: osx/azure-pipelines.yml
-
-      - template: linux/azure-pipelines.yml
-        parameters:
-          poolName: $(linux-pool)
+  - template: linux/azure-pipelines.yml
+    parameters:
+      poolName: $(linux-pool)