diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-08-18 10:18:41 +0200 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-08-18 10:18:41 +0200 |
commit | 1390b4c5e1207f41b66c69edc66496a5f9b63b12 (patch) | |
tree | 912a03dd3477931f5d90f20be558e3afb5ef7ebe /azure-pipelines.yml | |
parent | 458bc2dcf5044e1d5fde5326b2be35e526abd457 (diff) | |
parent | 4737aaeb36a4ff3b27d7bcbb374911197ed09e5a (diff) |
Merge master & resolve conflicts
Diffstat (limited to 'azure-pipelines.yml')
-rw-r--r-- | azure-pipelines.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 29ec23d0..8e88cab5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,11 +5,10 @@ jobs: timeoutInMinutes: 0 cancelTimeoutInMinutes: 60 pool: - vmImage: macOS-10.14 + vmImage: macOS-10.15 variables: pythonVersion: '3.6' cmakeBuildType: Release - customInstallation: 'brew update && brew install graphviz doxygen boost eigen gmp mpfr tbb cgal' steps: - bash: echo "##vso[task.prependpath]$CONDA/bin" @@ -23,7 +22,8 @@ jobs: sudo conda install --yes --quiet --name gudhi_build_env python=$(pythonVersion) python -m pip install --user -r .github/build-requirements.txt python -m pip install --user -r .github/test-requirements.txt - $(customInstallation) + brew update || true + brew install graphviz doxygen boost eigen gmp mpfr tbb cgal || true displayName: 'Install build dependencies' - bash: | source activate gudhi_build_env |