From 5793c4bd9f5d3a8e9087d444beba202e753ec4c9 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Tue, 2 Feb 2021 15:00:33 -0800 Subject: [vcpkg] Miscellaneous internal improvements extracted from #15424 (#15677) * [vcpkg] Miscellaneous internal improvements extracted from #15424 * [vcpkg] CR comments * [armadillo] Use vcpkg_from_git() to workaround gitlab missing archive Co-authored-by: Robert Schumacher Co-authored-by: Billy Robert O'Neal III --- scripts/azure-pipelines/linux/azure-pipelines.yml | 2 ++ scripts/azure-pipelines/osx/azure-pipelines.yml | 2 ++ scripts/azure-pipelines/windows/azure-pipelines.yml | 1 + 3 files changed, 5 insertions(+) (limited to 'scripts') diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 40089bc24..b20908f97 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -36,6 +36,8 @@ jobs: 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: diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index fa0d0e056..50bba080f 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -33,6 +33,8 @@ jobs: 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: diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 3c180f7eb..4c46e86a7 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -45,6 +45,7 @@ jobs: rmdir /s /q build.x86.debug > nul 2> nul cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DVCPKG_DEVELOPMENT_WARNINGS=ON -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=ON -B build.x86.debug -S toolsrc ninja.exe -C build.x86.debug + set VCPKG_DEBUG=1 build.x86.debug\vcpkg-test.exe cmake -G "Visual Studio 16 2019" -A Win32 -T v140 -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B build.x86.vs2015 -S toolsrc cmake --build build.x86.vs2015 -- cgit v1.2.3