From 6a67e42da7ee67cc55b5d3057d8e5a5d8eeddfcc Mon Sep 17 00:00:00 2001 From: Etienne Samson Date: Mon, 8 Oct 2018 19:33:27 +0200 Subject: ci: use Ninja on macOS --- azure-pipelines.yml | 1 + ci/setup-osx.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 620601d24..a891de0b6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -69,6 +69,7 @@ jobs: TMPDIR: $(Agent.TempDirectory) PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig LEAK_CHECK: leaks + CMAKE_OPTIONS: -G Ninja - job: windows_vs_amd64 displayName: 'Windows (Visual Studio; amd64)' diff --git a/ci/setup-osx.sh b/ci/setup-osx.sh index 564910e41..2e630eedb 100755 --- a/ci/setup-osx.sh +++ b/ci/setup-osx.sh @@ -3,6 +3,6 @@ set -x brew update -brew install pkgconfig zlib curl openssl libssh2 +brew install pkgconfig zlib curl openssl libssh2 ninja ln -s /Applications/Xcode.app/Contents/Developer/usr/lib/libLeaksAtExit.dylib /usr/local/lib -- cgit v1.2.1 From f77e6cc74a9de44107fd0cb4b8e684da6aae709d Mon Sep 17 00:00:00 2001 From: Etienne Samson Date: Fri, 19 Oct 2018 17:10:01 +0000 Subject: ci: make the Ubuntu/OpenSSL build explicit --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a891de0b6..db64c7d59 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,6 +16,7 @@ jobs: imageName: 'libgit2/trusty-openssl:latest' environmentVariables: | CC=gcc + CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL LEAK_CHECK=valgrind - job: linux_trusty_gcc_mbedtls @@ -41,6 +42,7 @@ jobs: imageName: 'libgit2/trusty-openssl:latest' environmentVariables: | CC=clang + CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL LEAK_CHECK=valgrind - job: linux_trusty_clang_mbedtls -- cgit v1.2.1