diff options
| author | Billy O'Neal <bion@microsoft.com> | 2021-06-29 13:47:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-29 13:47:39 -0700 |
| commit | 75beef03d64893d685ec09346147965ee92e1f3f (patch) | |
| tree | d691264f9be951be6d96d2462bd31267c4d13b60 | |
| parent | 8573c7002e01107e7ddd6ff19b4adc56ce3269a9 (diff) | |
| download | vcpkg-75beef03d64893d685ec09346147965ee92e1f3f.tar.gz vcpkg-75beef03d64893d685ec09346147965ee92e1f3f.zip | |
Update vcpkg tool to resolve leak of the asset cache token (#18720)
| -rw-r--r-- | scripts/azure-pipelines/linux/azure-pipelines.yml | 4 | ||||
| -rw-r--r-- | scripts/azure-pipelines/osx/azure-pipelines.yml | 3 | ||||
| -rw-r--r-- | scripts/azure-pipelines/windows/azure-pipelines.yml | 4 | ||||
| -rw-r--r-- | scripts/bootstrap.ps1 | 2 | ||||
| -rw-r--r-- | scripts/bootstrap.sh | 4 |
5 files changed, 9 insertions, 8 deletions
diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 83ef7e27c..0c126d886 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -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
diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 19612c3cc..2e9f05d63 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -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
diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index a822888ab..ed5a0a405 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -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
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 37cab340f..6ffcddddc 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -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) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 4ee1c11eb..0c612cff2 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -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" |