From aa60b7efa56a83ead743718941d8b320ef4a05af Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 4 Feb 2021 10:15:44 -0800 Subject: [vcpkg] Download vcpkg.exe rather than building it in bootstrap on Windows. (#15474) This reduces bootstrap cost for Windows customers, resolving the issue initially submitted as #12502 . The `toolsrc` tree was extracted to https://github.com/microsoft/vcpkg-tool. `bootstrap.sh` was changed to download the right source tarball, extract, and build it. This was chosen over the previous attempt, a submodule, over concerns of accidentally destroying people's local modifications. --- scripts/azure-pipelines/linux/azure-pipelines.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'scripts/azure-pipelines/linux') diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index b20908f97..df5cceda6 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -30,20 +30,9 @@ jobs: exit 0 displayName: 'Create ${{ variables.VCPKG_DOWNLOADS }}' - task: Bash@3 - displayName: 'Build vcpkg' + displayName: 'Bootstrap vcpkg' inputs: filePath: bootstrap-vcpkg.sh - arguments: '-buildTests' - - bash: toolsrc/build.rel/vcpkg-test - displayName: 'Run vcpkg tests' - env: - VCPKG_DEBUG: 1 - - task: PowerShell@2 - displayName: 'Run vcpkg end-to-end tests' - inputs: - filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1' - arguments: '-Triplet x64-linux -WorkingRoot ${{ variables.WORKING_ROOT }}' - pwsh: true - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' inputs: -- cgit v1.2.3