From f670aa5657fe1b1b4524b57a334fb75baf4e34b2 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Mon, 4 Oct 2021 11:52:47 -0700
Subject: Use the correct SAS token for macos and fix tensorflow build failing
 on success. (#20512)

* Use the correct SAS token for macos and fix tensorflow build failing on success.

* Fix binary cache.
---
 scripts/azure-pipelines/osx/azure-pipelines.yml | 8 ++++----
 scripts/azure-pipelines/test-modified-ports.ps1 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml
index f90a7c82c..a8d94f6f6 100644
--- a/scripts/azure-pipelines/osx/azure-pipelines.yml
+++ b/scripts/azure-pipelines/osx/azure-pipelines.yml
@@ -27,9 +27,9 @@ jobs:
     value: /Users/vagrant/Data
   - name: VCPKG_DOWNLOADS
     value: /Users/vagrant/Data/downloads
-  - group: osx-binary-caching-credentials
-  - name: BINARY_SOURCE_STUB
-    value: "x-azblob,$(root-url),$(sas)"
+  - group: vcpkg-binary-caching-credentials
+  - name: X_VCPKG_BINARY_SOURCE_STUB
+    value: "x-azblob,$(root-bin-url),$(sas-bin)"
   - group: vcpkg-asset-caching-credentials
   - name: X_VCPKG_ASSET_SOURCES
     value: "x-azurl,$(root-url),$(sas),readwrite"
@@ -67,7 +67,7 @@ jobs:
       arguments: >
         -Triplet "x64-osx"
         -BuildReason "$(Build.Reason)"
-        -BinarySourceStub "${{ variables.BINARY_SOURCE_STUB }}"
+        -BinarySourceStub "${{ variables.X_VCPKG_BINARY_SOURCE_STUB }}"
         -WorkingRoot "${{ variables.WORKING_ROOT }}"
         -ArtifactStagingDirectory "$(Build.ArtifactStagingDirectory)"
         ${{ variables.PowershellExtraArguments }}
diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1
index d837dbb62..6f25eb4c5 100755
--- a/scripts/azure-pipelines/test-modified-ports.ps1
+++ b/scripts/azure-pipelines/test-modified-ports.ps1
@@ -140,6 +140,9 @@ if ($null -ne $OnlyTest)
             )
         }
     }
+
+    $failureLogsEmpty = ((Test-Path $failureLogs) -and (Get-ChildItem $failureLogs).count -eq 0)
+    Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty"
 }
 else
 {
-- 
cgit v1.2.3