From 217194cea7e3491c14779c763beec50b6a4575d6 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Fri, 7 Apr 2023 19:21:44 -0700
Subject: [PATCH] Fix cancellation, from @dan-shaw's branch: (#30722)

https://github.com/dan-shaw/vcpkg/commit/b877a10a13eaf567852d53d35a68545b4d1d5026

Co-authored-by: dan-shaw <51385773+dan-shaw@users.noreply.github.com>
---
 scripts/azure-pipelines/linux/azure-pipelines.yml   | 2 +-
 scripts/azure-pipelines/osx/azure-pipelines.yml     | 2 +-
 scripts/azure-pipelines/windows/azure-pipelines.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml
index 2b50cf3b6f..dda9f12bb1 100644
--- a/scripts/azure-pipelines/linux/azure-pipelines.yml
+++ b/scripts/azure-pipelines/linux/azure-pipelines.yml
@@ -16,7 +16,7 @@ parameters:
 
 jobs:
 - job: x64_linux
-  condition: contains('^x64-linux$', '${{ parameters.tripletPattern }}')
+  condition: and(succeeded(), contains('^x64-linux$', '${{ parameters.tripletPattern }}'))
   pool:
     name: ${{ parameters.poolName }}
   workspace:
diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml
index 332144e56f..1e9aff0862 100644
--- a/scripts/azure-pipelines/osx/azure-pipelines.yml
+++ b/scripts/azure-pipelines/osx/azure-pipelines.yml
@@ -16,7 +16,7 @@ parameters:
 
 jobs:
 - job: x64_osx
-  condition: contains('^x64-osx$', '${{ parameters.tripletPattern }}')
+  condition: and(succeeded(), contains('^x64-osx$', '${{ parameters.tripletPattern }}'))
   pool:
     name: ${{ parameters.poolName }}
   workspace:
diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml
index 3caf700ef6..e99758c738 100644
--- a/scripts/azure-pipelines/windows/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows/azure-pipelines.yml
@@ -22,7 +22,7 @@ parameters:
 
 jobs:
 - job: ${{ parameters.jobName }}
-  condition: contains('^${{ parameters.triplet }}$', '${{ parameters.tripletPattern }}')
+  condition: and(succeeded(), contains('^${{ parameters.triplet }}$', '${{ parameters.tripletPattern }}'))
   pool:
     name: ${{ parameters.poolName }}
   workspace: