From 977769e8f3799eabd5ab94aa63020bfa28bca0a1 Mon Sep 17 00:00:00 2001 From: Charlie Date: Mon, 1 Feb 2021 19:50:19 -0800 Subject: [PATCH] fix macos-vcpkg pipelines --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 96a6c9c066..b83222df04 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -130,14 +130,14 @@ jobs: - task: CMake@1 inputs: workingDirectory: 'build.debug' - cmakeArgs: '-G Ninja -DCMAKE_MAKE_PROGRAM=$(Build.SourcesDirectory)/vcpkg/downloads/tools/ninja-1.10.0-osx/ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' + cmakeArgs: '-G Ninja -DCMAKE_MAKE_PROGRAM=$(Build.SourcesDirectory)/vcpkg/downloads/tools/ninja-1.10.1-osx/ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' - task: CMake@1 inputs: workingDirectory: 'build.release' - cmakeArgs: '-G Ninja -DCMAKE_MAKE_PROGRAM=$(Build.SourcesDirectory)/vcpkg/downloads/tools/ninja-1.10.0-osx/ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' + cmakeArgs: '-G Ninja -DCMAKE_MAKE_PROGRAM=$(Build.SourcesDirectory)/vcpkg/downloads/tools/ninja-1.10.1-osx/ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' - script: | cd build.debug - $(Build.SourcesDirectory)/vcpkg/downloads/tools/ninja-1.10.0-osx/ninja + $(Build.SourcesDirectory)/vcpkg/downloads/tools/ninja-1.10.1-osx/ninja displayName: 'Run ninja debug' - script: | cd build.debug/Release/Binaries @@ -145,7 +145,7 @@ jobs: displayName: 'Run Tests debug' - script: | cd build.release - $(Build.SourcesDirectory)/vcpkg/downloads/tools/ninja-1.10.0-osx/ninja + $(Build.SourcesDirectory)/vcpkg/downloads/tools/ninja-1.10.1-osx/ninja displayName: 'Run ninja, release' - script: | cd build.release/Release/Binaries