Skip to content

Update vcpkg tool to resolve leak of the asset cache token #18720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 2 commits into from
Jun 29, 2021
Merged

Update vcpkg tool to resolve leak of the asset cache token #18720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b94d6f
Update vcpkg tool to resolve leak of the asset cache token, and updat…
BillyONeal Jun 29, 2021
ade5d5e
🤦‍♂️
BillyONeal Jun 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/linux/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
value: /mnt/vcpkg-ci
- name: VCPKG_DOWNLOADS
value: /mnt/vcpkg-ci/downloads
- group: azblob-test-sas-group
- group: vcpkg-asset-caching-credentials
- name: X_VCPKG_ASSET_SOURCES
value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite"
value: "x-azurl,$(root-url),$(sas),readwrite"

steps:
- bash: df -h
Expand Down
3 changes: 2 additions & 1 deletion scripts/azure-pipelines/osx/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ jobs:
- group: osx-2021-04-16
- name: BINARY_SOURCE_STUB
value: "x-azblob,$(azblob-root-url),$(azblob-test-sas)"
- group: vcpkg-asset-caching-credentials
- name: X_VCPKG_ASSET_SOURCES
value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite"
value: "x-azurl,$(root-url),$(sas),readwrite"

steps:
- bash: df -h
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/windows/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
value: D:\
- name: VCPKG_DOWNLOADS
value: D:\downloads
- group: azblob-test-sas-group
- group: vcpkg-asset-caching-credentials
- name: X_VCPKG_ASSET_SOURCES
value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite"
value: "x-azurl,$(root-url),$(sas),readwrite"

steps:
- task: PowerShell@2
Expand Down
2 changes: 1 addition & 1 deletion scripts/bootstrap.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))

Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"

& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-06-19/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-06-29/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
Write-Host ""

if ($LASTEXITCODE -ne 0)
Expand Down
4 changes: 2 additions & 2 deletions scripts/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ else
fi

# Do the build
vcpkgToolReleaseTag="2021-06-19"
vcpkgToolReleaseSha="e9626023b5b545ac88985a0b1bec2d1784f2c5724cc23c6dacf7bf5851c1c7b34649d11192bcd20e41a6340dc6a8d557cace20016a0e121cc8975613f11343ef"
vcpkgToolReleaseTag="2021-06-29"
vcpkgToolReleaseSha="ffaa649cdb996946deff538ed0df192dffff41eb838179566aa77f91cdaaeadea7cd058bb4b230057f4b14703fbcd3c557b398ec7388d94177d3fc31073e7b6b"
vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz"
vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball"
baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg"
Expand Down