diff options
| author | Vincent Rouvreau <10407034+VincentRouvreau@users.noreply.github.com> | 2020-08-04 13:49:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-04 13:49:54 +0200 |
| commit | 2b7524879e2c09cd9a197e6b58a7cc31dc5ed056 (patch) | |
| tree | 1980b8fbff5d4dccb457f33975c47ee56c0a7d02 | |
| parent | f98133a79b8a34ade8a0c214f75264e955420e7e (diff) | |
| parent | a62d13c43a882cdf93faffd3ddfae96c30af678e (diff) | |
Merge pull request #373 from VincentRouvreau/brew_fix
Avoid brew install cgal issue
| -rw-r--r-- | .github/workflows/pip-packaging-osx.yml | 3 | ||||
| -rw-r--r-- | CMakeGUDHIVersion.txt | 2 | ||||
| -rw-r--r-- | azure-pipelines.yml | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 85c3c807..c94369ac 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -22,7 +22,8 @@ jobs: architecture: x64 - name: Install dependencies run: | - brew update && brew install boost eigen gmp mpfr cgal + brew update || true + brew install boost eigen gmp mpfr cgal || true python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine delocate - name: Build python wheel diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index a78b8adc..4ed57729 100644 --- a/CMakeGUDHIVersion.txt +++ b/CMakeGUDHIVersion.txt @@ -2,7 +2,7 @@ set (GUDHI_MAJOR_VERSION 3) set (GUDHI_MINOR_VERSION 3) # GUDHI_PATCH_VERSION can be 'ZaN' for Alpha release, 'ZbN' for Beta release, 'ZrcN' for release candidate or 'Z' for a final release. -set (GUDHI_PATCH_VERSION 0rc1) +set (GUDHI_PATCH_VERSION 0rc2) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") 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 |