diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-10-20 18:14:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-20 18:14:25 +0100 |
| commit | 2ad07ad557516c47ec48732c2ae01c91c5b3034c (patch) | |
| tree | ff549629226db986a415850c00050eeb0d01671f | |
| parent | 0fccf0179dadadc63006902c5acb4fb34873dadd (diff) | |
| parent | f77e6cc74a9de44107fd0cb4b8e684da6aae709d (diff) | |
| download | libgit2-2ad07ad557516c47ec48732c2ae01c91c5b3034c.tar.gz | |
Merge pull request #4841 from tiennou/ci/ninja-build
Ninja build
| -rw-r--r-- | azure-pipelines.yml | 3 | ||||
| -rwxr-xr-x | ci/setup-osx.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 620601d24..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 @@ -69,6 +71,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 |