From 26449f444f2974040f263da45e31d5d1874ba0d4 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sat, 6 Apr 2019 23:53:40 -0400 Subject: [PATCH] Executive decision: only run Ninja builds on CI. I only use these anyway, and this will let CI builds and releases go faster. If something breaks for other people, they will report bugs anyway, as they already have... --- azure-pipelines.yml | 32 ++--- azure-pipelines_linux | 28 ++--- azure-pipelines_main | 268 +++++------------------------------------- 3 files changed, 62 insertions(+), 266 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33980cb1..4aa5ec5e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,8 +4,8 @@ variables: releaseExamples: 'controlgallery cpp-multithread datetime drawtext histogram tester timer' jobs: -- job: windows_386_msvc2015_shared_ninja - displayName: 'Windows 386 MSVC2015 Shared Ninja' +- job: windows_386_msvc2015_shared + displayName: 'Windows 386 MSVC2015 Shared' pool: vmImage: 'vs2015-win2012r2' workspace: @@ -13,13 +13,13 @@ jobs: steps: - template: azure-pipelines/vs2015-install-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/windows-install-ninja.yml + - template: azure-pipelines/windows-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 defaultLibrary: shared backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - template: azure-pipelines/windows-artifacts.yml @@ -31,8 +31,8 @@ jobs: libfiles: libui.dll libui.exp libui.lib osHeader: ui_windows.h -- job: windows_386_msvc2015_static_ninja - displayName: 'Windows 386 MSVC2015 Static Ninja' +- job: windows_386_msvc2015_static + displayName: 'Windows 386 MSVC2015 Static' pool: vmImage: 'vs2015-win2012r2' workspace: @@ -40,13 +40,13 @@ jobs: steps: - template: azure-pipelines/vs2015-install-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/windows-install-ninja.yml + - template: azure-pipelines/windows-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 defaultLibrary: static backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 afterBuild: ren build\meson-out\libui.a libui.lib @@ -59,8 +59,8 @@ jobs: libfiles: libui.lib osHeader: ui_windows.h -- job: windows_386_msvc2017_shared_ninja - displayName: 'Windows 386 MSVC2017 Shared Ninja' +- job: windows_386_msvc2017_shared + displayName: 'Windows 386 MSVC2017 Shared' pool: vmImage: 'vs2017-win2016' workspace: @@ -68,13 +68,13 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/windows-install-ninja.yml + - template: azure-pipelines/windows-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 defaultLibrary: shared backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 - template: azure-pipelines/windows-artifacts.yml @@ -86,8 +86,8 @@ jobs: libfiles: libui.dll libui.exp libui.lib osHeader: ui_windows.h -- job: windows_386_msvc2017_static_ninja - displayName: 'Windows 386 MSVC2017 Static Ninja' +- job: windows_386_msvc2017_static + displayName: 'Windows 386 MSVC2017 Static' pool: vmImage: 'vs2017-win2016' workspace: @@ -95,13 +95,13 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/windows-install-ninja.yml + - template: azure-pipelines/windows-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 defaultLibrary: static backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 afterBuild: ren build\meson-out\libui.a libui.lib diff --git a/azure-pipelines_linux b/azure-pipelines_linux index 3beae09c..6ed4cc61 100644 --- a/azure-pipelines_linux +++ b/azure-pipelines_linux @@ -4,8 +4,8 @@ variables: releaseExamples: 'controlgallery cpp-multithread datetime drawtext histogram tester timer' jobs: -- job: linux_amd64_shared_ninja - displayName: 'Linux amd64 Shared with Ninja' +- job: linux_amd64_shared + displayName: 'Linux amd64 Shared' pool: vmImage: 'ubuntu-16.04' workspace: @@ -20,7 +20,7 @@ jobs: parameters: defaultLibrary: shared backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml - template: azure-pipelines/darwinunix-artifacts.yml parameters: os: linux @@ -29,8 +29,8 @@ jobs: libfiles: libui.so.0 osHeader: ui_unix.h -- job: linux_amd64_static_ninja - displayName: 'Linux amd64 Static with Ninja' +- job: linux_amd64_static + displayName: 'Linux amd64 Static' pool: vmImage: 'ubuntu-16.04' workspace: @@ -45,7 +45,7 @@ jobs: parameters: defaultLibrary: static backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml - template: azure-pipelines/darwinunix-artifacts.yml parameters: os: linux @@ -61,8 +61,8 @@ jobs: # TODO macosx10.14 doesn't work; it just uses the default SDK -- job: darwin_amd64_1014sdk_shared_ninja - displayName: 'Darwin amd64 10.14 SDK Shared with Ninja' +- job: darwin_amd64_1014sdk_shared + displayName: 'Darwin amd64 10.14 SDK Shared' pool: vmImage: 'macos-10.13' workspace: @@ -70,13 +70,13 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/darwin-install-ninja.yml + - template: azure-pipelines/darwin-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) defaultLibrary: shared backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) - template: azure-pipelines/darwinunix-artifacts.yml @@ -87,8 +87,8 @@ jobs: libfiles: libui.A.dylib osHeader: ui_darwin.h -- job: darwin_amd64_1014sdk_static_ninja - displayName: 'Darwin amd64 10.14 SDK Static with Ninja' +- job: darwin_amd64_1014sdk_static + displayName: 'Darwin amd64 10.14 SDK Static' pool: vmImage: 'macos-10.13' workspace: @@ -96,13 +96,13 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/darwin-install-ninja.yml + - template: azure-pipelines/darwin-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) defaultLibrary: static backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) - template: azure-pipelines/darwinunix-artifacts.yml diff --git a/azure-pipelines_main b/azure-pipelines_main index 6e491eb4..40926063 100644 --- a/azure-pipelines_main +++ b/azure-pipelines_main @@ -4,8 +4,8 @@ jobs: # vs2015 { -- job: windows_386_msvc2015_shared_ninja - displayName: 'Windows 386 MSVC2015 Shared Ninja' +- job: windows_amd64_msvc2015_shared + displayName: 'Windows amd64 MSVC2015 Shared' pool: vmImage: 'vs2015-win2012r2' workspace: @@ -13,88 +13,18 @@ jobs: steps: - template: azure-pipelines/vs2015-install-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/windows-install-ninja.yml - - template: azure-pipelines/configure.yml - parameters: - beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - defaultLibrary: shared - backend: ninja - - template: azure-pipelines/build-ninja.yml - parameters: - beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - -- job: windows_386_msvc2015_static_ninja - displayName: 'Windows 386 MSVC2015 Static Ninja' - pool: - vmImage: 'vs2015-win2012r2' - workspace: - clean: all - steps: - - template: azure-pipelines/vs2015-install-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/windows-install-ninja.yml - - template: azure-pipelines/configure.yml - parameters: - beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - defaultLibrary: static - backend: ninja - - template: azure-pipelines/build-ninja.yml - parameters: - beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - -- job: windows_386_msvc2015_shared_msbuild - displayName: 'Windows 386 MSVC2015 Shared with MSBuild' - pool: - vmImage: 'vs2015-win2012r2' - workspace: - clean: all - steps: - - template: azure-pipelines/vs2015-install-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/configure.yml - parameters: - beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - defaultLibrary: shared - backend: vs2015 - - template: azure-pipelines/build-msbuild.yml - -- job: windows_386_msvc2015_static_msbuild - displayName: 'Windows 386 MSVC2015 Static with MSBuild' - pool: - vmImage: 'vs2015-win2012r2' - workspace: - clean: all - steps: - - template: azure-pipelines/vs2015-install-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/configure.yml - parameters: - beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - defaultLibrary: static - backend: vs2015 - - template: azure-pipelines/build-msbuild.yml - -- job: windows_amd64_msvc2015_shared_ninja - displayName: 'Windows amd64 MSVC2015 Shared Ninja' - pool: - vmImage: 'vs2015-win2012r2' - workspace: - clean: all - steps: - - template: azure-pipelines/vs2015-install-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/windows-install-ninja.yml + - template: azure-pipelines/windows-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 defaultLibrary: shared backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 -- job: windows_amd64_msvc2015_static_ninja - displayName: 'Windows amd64 MSVC2015 Static Ninja' +- job: windows_amd64_msvc2015_static + displayName: 'Windows amd64 MSVC2015 Static' pool: vmImage: 'vs2015-win2012r2' workspace: @@ -102,54 +32,22 @@ jobs: steps: - template: azure-pipelines/vs2015-install-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/windows-install-ninja.yml + - template: azure-pipelines/windows-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 defaultLibrary: static backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 -- job: windows_amd64_msvc2015_shared_msbuild - displayName: 'Windows amd64 MSVC2015 Shared with MSBuild' - pool: - vmImage: 'vs2015-win2012r2' - workspace: - clean: all - steps: - - template: azure-pipelines/vs2015-install-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/configure.yml - parameters: - beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - defaultLibrary: shared - backend: vs2015 - - template: azure-pipelines/build-msbuild.yml - -- job: windows_amd64_msvc2015_static_msbuild - displayName: 'Windows amd64 MSVC2015 Static with MSBuild' - pool: - vmImage: 'vs2015-win2012r2' - workspace: - clean: all - steps: - - template: azure-pipelines/vs2015-install-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/configure.yml - parameters: - beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - defaultLibrary: static - backend: vs2015 - - template: azure-pipelines/build-msbuild.yml - # } # vs2017 { -- job: windows_386_msvc2017_shared_ninja - displayName: 'Windows 386 MSVC2017 Shared Ninja' +- job: windows_amd64_msvc2017_shared + displayName: 'Windows amd64 MSVC2017 Shared' pool: vmImage: 'vs2017-win2016' workspace: @@ -157,88 +55,18 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/windows-install-ninja.yml - - template: azure-pipelines/configure.yml - parameters: - beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 - defaultLibrary: shared - backend: ninja - - template: azure-pipelines/build-ninja.yml - parameters: - beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 - -- job: windows_386_msvc2017_static_ninja - displayName: 'Windows 386 MSVC2017 Static Ninja' - pool: - vmImage: 'vs2017-win2016' - workspace: - clean: all - steps: - - template: azure-pipelines/setup-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/windows-install-ninja.yml - - template: azure-pipelines/configure.yml - parameters: - beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 - defaultLibrary: static - backend: ninja - - template: azure-pipelines/build-ninja.yml - parameters: - beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 - -- job: windows_386_msvc2017_shared_msbuild - displayName: 'Windows 386 MSVC2017 Shared with MSBuild' - pool: - vmImage: 'vs2017-win2016' - workspace: - clean: all - steps: - - template: azure-pipelines/setup-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/configure.yml - parameters: - beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 - defaultLibrary: shared - backend: vs2017 - - template: azure-pipelines/build-msbuild.yml - -- job: windows_386_msvc2017_static_msbuild - displayName: 'Windows 386 MSVC2017 Static with MSBuild' - pool: - vmImage: 'vs2017-win2016' - workspace: - clean: all - steps: - - template: azure-pipelines/setup-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/configure.yml - parameters: - beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 - defaultLibrary: static - backend: vs2017 - - template: azure-pipelines/build-msbuild.yml - -- job: windows_amd64_msvc2017_shared_ninja - displayName: 'Windows amd64 MSVC2017 Shared Ninja' - pool: - vmImage: 'vs2017-win2016' - workspace: - clean: all - steps: - - template: azure-pipelines/setup-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/windows-install-ninja.yml + - template: azure-pipelines/windows-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 defaultLibrary: shared backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 -- job: windows_amd64_msvc2017_static_ninja - displayName: 'Windows amd64 MSVC2017 Static Ninja' +- job: windows_amd64_msvc2017_static + displayName: 'Windows amd64 MSVC2017 Static' pool: vmImage: 'vs2017-win2016' workspace: @@ -246,54 +74,22 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/windows-install-ninja.yml + - template: azure-pipelines/windows-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 defaultLibrary: static backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 -- job: windows_amd64_msvc2017_shared_msbuild - displayName: 'Windows amd64 MSVC2017 Shared with MSBuild' - pool: - vmImage: 'vs2017-win2016' - workspace: - clean: all - steps: - - template: azure-pipelines/setup-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/configure.yml - parameters: - beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 - defaultLibrary: shared - backend: vs2017 - - template: azure-pipelines/build-msbuild.yml - -- job: windows_amd64_msvc2017_static_msbuild - displayName: 'Windows amd64 MSVC2017 Static with MSBuild' - pool: - vmImage: 'vs2017-win2016' - workspace: - clean: all - steps: - - template: azure-pipelines/setup-python3.yml - - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/configure.yml - parameters: - beforeConfigure: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 - defaultLibrary: static - backend: vs2017 - - template: azure-pipelines/build-msbuild.yml - # } # more mac { -- job: darwin_amd64_1012sdk_shared_ninja - displayName: 'Darwin amd64 10.12 SDK Shared with Ninja' +- job: darwin_amd64_1012sdk_shared + displayName: 'Darwin amd64 10.12 SDK Shared' pool: vmImage: 'macos-10.13' workspace: @@ -301,18 +97,18 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/darwin-install-ninja.yml + - template: azure-pipelines/darwin-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path) defaultLibrary: shared backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path) -- job: darwin_amd64_1012sdk_static_ninja - displayName: 'Darwin amd64 10.12 SDK Static with Ninja' +- job: darwin_amd64_1012sdk_static + displayName: 'Darwin amd64 10.12 SDK Static' pool: vmImage: 'macos-10.13' workspace: @@ -320,18 +116,18 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/darwin-install-ninja.yml + - template: azure-pipelines/darwin-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path) defaultLibrary: static backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path) -- job: darwin_amd64_1013sdk_shared_ninja - displayName: 'Darwin amd64 10.13 SDK Shared with Ninja' +- job: darwin_amd64_1013sdk_shared + displayName: 'Darwin amd64 10.13 SDK Shared' pool: vmImage: 'macos-10.13' workspace: @@ -339,18 +135,18 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/darwin-install-ninja.yml + - template: azure-pipelines/darwin-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path) defaultLibrary: shared backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path) -- job: darwin_amd64_1013sdk_static_ninja - displayName: 'Darwin amd64 10.13 SDK Static with Ninja' +- job: darwin_amd64_1013sdk_static + displayName: 'Darwin amd64 10.13 SDK Static' pool: vmImage: 'macos-10.13' workspace: @@ -358,13 +154,13 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/darwin-install-ninja.yml + - template: azure-pipelines/darwin-install.yml - template: azure-pipelines/configure.yml parameters: beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path) defaultLibrary: static backend: ninja - - template: azure-pipelines/build-ninja.yml + - template: azure-pipelines/build.yml parameters: beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path)