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.
This commit is contained in:
Billy O'Neal 2021-10-04 11:52:47 -07:00 committed by GitHub
parent 2a31089e77
commit f670aa5657
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions

View File

@ -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 }}

View File

@ -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
{