From 055613adaf9a4775bed359bea050e436b9238c2f Mon Sep 17 00:00:00 2001 From: Wes Haggard <Wes.Haggard@microsoft.com> Date: Tue, 14 Jan 2025 17:45:54 -0800 Subject: [PATCH] Move vcpkg cache to azuresdkartifacts --- .vscode/cspell.json | 1 - doc/PerformanceTesting.md | 2 +- eng/pipelines/templates/jobs/perf.yml | 2 +- eng/pipelines/templates/steps/vcpkg.yml | 4 ++-- eng/scripts/Set-VcpkgWriteModeCache.ps1 | 6 +++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.vscode/cspell.json b/.vscode/cspell.json index 080186e8e05..aa866e8e755 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -329,7 +329,6 @@ "issecret", "PSScriptRoot", "BUILDID", - "cppvcpkgcache", "cmakegenerate", "cmakesourcegenerate" ] diff --git a/doc/PerformanceTesting.md b/doc/PerformanceTesting.md index a7832e8e062..703cdee0d7b 100644 --- a/doc/PerformanceTesting.md +++ b/doc/PerformanceTesting.md @@ -123,7 +123,7 @@ extends: AdditionalArguments: ${{ parameters.AdditionalArguments }} InstallLanguageSteps: - pwsh: | - Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azblob,https://cppvcpkgcache.blob.core.windows.net/public-vcpkg-container,,read" + Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azblob,https://azuresdkartifacts.blob.core.windows.net/public-vcpkg-container,,read" displayName: Set Vcpkg Variables EnvVars: diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml index a9063d85470..a56adab61a3 100644 --- a/eng/pipelines/templates/jobs/perf.yml +++ b/eng/pipelines/templates/jobs/perf.yml @@ -36,7 +36,7 @@ extends: LanguageVersion: 'N/A' InstallLanguageSteps: - pwsh: | - Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azblob,https://cppvcpkgcache.blob.core.windows.net/public-vcpkg-container,,read" + Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azblob,https://azuresdkartifacts.blob.core.windows.net/public-vcpkg-container,,read" displayName: Set Vcpkg Variables - ${{ if parameters.Profile }}: - task: Bash@3 diff --git a/eng/pipelines/templates/steps/vcpkg.yml b/eng/pipelines/templates/steps/vcpkg.yml index ddb66977e26..925527d69cc 100644 --- a/eng/pipelines/templates/steps/vcpkg.yml +++ b/eng/pipelines/templates/steps/vcpkg.yml @@ -1,7 +1,7 @@ steps: - pwsh: | - Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azblob,https://cppvcpkgcache.blob.core.windows.net/public-vcpkg-container,,read" - Write-Host "##vso[task.setvariable variable=X_VCPKG_ASSET_SOURCES_SECRET;issecret=true;]clear;x-azurl,https://cppvcpkgcache.blob.core.windows.net/public-vcpkg-container,,read" + Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azblob,https://azuresdkartifacts.blob.core.windows.net/public-vcpkg-container,,read" + Write-Host "##vso[task.setvariable variable=X_VCPKG_ASSET_SOURCES_SECRET;issecret=true;]clear;x-azurl,https://azuresdkartifacts.blob.core.windows.net/public-vcpkg-container,,read" displayName: Set Vcpkg Variables - script: vcpkg --version diff --git a/eng/scripts/Set-VcpkgWriteModeCache.ps1 b/eng/scripts/Set-VcpkgWriteModeCache.ps1 index 5435f09a653..bae52225cbd 100644 --- a/eng/scripts/Set-VcpkgWriteModeCache.ps1 +++ b/eng/scripts/Set-VcpkgWriteModeCache.ps1 @@ -1,5 +1,5 @@ param( - [string] $StorageAccountName = 'cppvcpkgcache', + [string] $StorageAccountName = 'azuresdkartifacts', [string] $StorageContainerName = 'public-vcpkg-container' ) @@ -40,5 +40,5 @@ Write-Host "Ensure redaction of SAS tokens in logs" Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SAS_TOKEN;issecret=true;]$vcpkgBinarySourceSas" Write-Host "Setting vcpkg binary cache to read and write" -Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azblob,https://cppvcpkgcache.blob.core.windows.net/$StorageContainerName,$vcpkgBinarySourceSas,readwrite" -Write-Host "##vso[task.setvariable variable=X_VCPKG_ASSET_SOURCES_SECRET;issecret=true;]clear;x-azurl,https://cppvcpkgcache.blob.core.windows.net/$StorageContainerName,$vcpkgBinarySourceSas,readwrite" +Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azblob,https://$StorageAccountName.blob.core.windows.net/$StorageContainerName,$vcpkgBinarySourceSas,readwrite" +Write-Host "##vso[task.setvariable variable=X_VCPKG_ASSET_SOURCES_SECRET;issecret=true;]clear;x-azurl,https://$StorageAccountName.blob.core.windows.net/$StorageContainerName,$vcpkgBinarySourceSas,readwrite"