3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 11:21:12 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Billy O'Neal 2021-06-29 13:47:39 -07:00 committed by GitHub
parent 8573c7002e
commit 75beef03d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/azure-pipelines/linux/azure-pipelines.yml
View File

@ -14,9 +14,9 @@ jobs:
value: /mnt/vcpkg-ci value: /mnt/vcpkg-ci
- name: VCPKG_DOWNLOADS - name: VCPKG_DOWNLOADS
value: /mnt/vcpkg-ci/downloads value: /mnt/vcpkg-ci/downloads
- group: azblob-test-sas-group - group: vcpkg-asset-caching-credentials
- name: X_VCPKG_ASSET_SOURCES - name: X_VCPKG_ASSET_SOURCES
value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite" value: "x-azurl,$(root-url),$(sas),readwrite"
steps: steps:
- bash: df -h - bash: df -h

3
scripts/azure-pipelines/osx/azure-pipelines.yml
View File

@ -17,8 +17,9 @@ jobs:
- group: osx-2021-04-16 - group: osx-2021-04-16
- name: BINARY_SOURCE_STUB - name: BINARY_SOURCE_STUB
value: "x-azblob,$(azblob-root-url),$(azblob-test-sas)" value: "x-azblob,$(azblob-root-url),$(azblob-test-sas)"
- group: vcpkg-asset-caching-credentials
- name: X_VCPKG_ASSET_SOURCES - name: X_VCPKG_ASSET_SOURCES
value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite" value: "x-azurl,$(root-url),$(sas),readwrite"
steps: steps:
- bash: df -h - bash: df -h

4
scripts/azure-pipelines/windows/azure-pipelines.yml
View File

@ -14,9 +14,9 @@ jobs:
value: D:\ value: D:\
- name: VCPKG_DOWNLOADS - name: VCPKG_DOWNLOADS
value: D:\downloads value: D:\downloads
- group: azblob-test-sas-group - group: vcpkg-asset-caching-credentials
- name: X_VCPKG_ASSET_SOURCES - name: X_VCPKG_ASSET_SOURCES
value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite" value: "x-azurl,$(root-url),$(sas),readwrite"
steps: steps:
- task: PowerShell@2 - task: PowerShell@2

2
scripts/bootstrap.ps1
View File

@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" 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 "" Write-Host ""
if ($LASTEXITCODE -ne 0) if ($LASTEXITCODE -ne 0)

4
scripts/bootstrap.sh
View File

@ -278,8 +278,8 @@ else
fi fi
# Do the build # Do the build
vcpkgToolReleaseTag="2021-06-19" vcpkgToolReleaseTag="2021-06-29"
vcpkgToolReleaseSha="e9626023b5b545ac88985a0b1bec2d1784f2c5724cc23c6dacf7bf5851c1c7b34649d11192bcd20e41a6340dc6a8d557cace20016a0e121cc8975613f11343ef" vcpkgToolReleaseSha="ffaa649cdb996946deff538ed0df192dffff41eb838179566aa77f91cdaaeadea7cd058bb4b230057f4b14703fbcd3c557b398ec7388d94177d3fc31073e7b6b"
vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz"
vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball"
baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg"