From d2a9aed9ada419b7715a77322ad17ddf3535d133 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 4 May 2020 19:23:40 +0200 Subject: Try to build with conda as brew fails --- azure-pipelines.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 95b15db2..fccb7d57 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,35 +4,36 @@ jobs: displayName: "Build and test" timeoutInMinutes: 0 cancelTimeoutInMinutes: 60 - + pool: + vmImage: macOS-10.14 strategy: matrix: - macOSrelease: - imageName: 'macos-10.14' - CMakeBuildType: Release - customInstallation: 'brew update && brew install graphviz doxygen boost eigen gmp mpfr tbb cgal' + Python36: + python.version: '3.6' + Python37: + python.version: '3.7' + Python38: + python.version: '3.8' - pool: - vmImage: $(imageName) - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.7' - architecture: 'x64' + - bash: echo "##vso[task.prependpath]$CONDA/bin" + displayName: Add conda to PATH + + - bash: conda create --yes --quiet --name gudhi_build_env + displayName: Create Anaconda environment - - script: | - $(customInstallation) + - bash: | + source activate gudhi_build_env + conda install --yes --quiet --name gudhi_build_env python=$PYTHON_VERSION git submodule update --init - python -m pip install --upgrade pip python -m pip install --user -r .github/build-requirements.txt python -m pip install --user -r .github/test-requirements.txt displayName: 'Install build dependencies' - - script: | + - bash: | mkdir build cd build cmake -DCMAKE_BUILD_TYPE:STRING=$(CMakeBuildType) -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 .. make make doxygen - ctest -j 8 --output-on-failure -E sphinx # remove sphinx build as it fails + ctest -j 8 --output-on-failure # -E sphinx remove sphinx build as it fails displayName: 'Build, test and documentation generation' -- cgit v1.2.3 From 5d03351f22f2511e3f5159f19f54b21bf2a04d61 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 4 May 2020 19:29:02 +0200 Subject: sudo ? --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fccb7d57..b50bd91a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,7 +19,7 @@ jobs: - bash: echo "##vso[task.prependpath]$CONDA/bin" displayName: Add conda to PATH - - bash: conda create --yes --quiet --name gudhi_build_env + - bash: sudo conda create --yes --quiet --name gudhi_build_env displayName: Create Anaconda environment - bash: | -- cgit v1.2.3 From 7bd1941307033193da4c1cfcef873e69ca7f68f3 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 4 May 2020 19:30:55 +0200 Subject: sudo ? --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b50bd91a..0fea11f6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -24,7 +24,7 @@ jobs: - bash: | source activate gudhi_build_env - conda install --yes --quiet --name gudhi_build_env python=$PYTHON_VERSION + sudo conda install --yes --quiet --name gudhi_build_env python=$PYTHON_VERSION git submodule update --init python -m pip install --user -r .github/build-requirements.txt python -m pip install --user -r .github/test-requirements.txt -- cgit v1.2.3 From 62139c92181b7f405ce0e36ef6b46777cee85b34 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 4 May 2020 22:22:26 +0200 Subject: Add conda build requirements --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0fea11f6..97c84136 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,6 +25,7 @@ jobs: - bash: | source activate gudhi_build_env sudo conda install --yes --quiet --name gudhi_build_env python=$PYTHON_VERSION + sudo conda install --yes -c conda-forge doxygen eigen boost-cpp=1.70.0 cgal-cpp>=5.0 git submodule update --init python -m pip install --user -r .github/build-requirements.txt python -m pip install --user -r .github/test-requirements.txt -- cgit v1.2.3 From b880228fb423aeb3d662416fbb477d3ced100e08 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 4 May 2020 22:31:13 +0200 Subject: Need to activate conda env to build --- azure-pipelines.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 97c84136..2fcff411 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,10 +10,10 @@ jobs: matrix: Python36: python.version: '3.6' - Python37: - python.version: '3.7' - Python38: - python.version: '3.8' + #Python37: + # python.version: '3.7' + #Python38: + # python.version: '3.8' steps: - bash: echo "##vso[task.prependpath]$CONDA/bin" @@ -26,11 +26,12 @@ jobs: source activate gudhi_build_env sudo conda install --yes --quiet --name gudhi_build_env python=$PYTHON_VERSION sudo conda install --yes -c conda-forge doxygen eigen boost-cpp=1.70.0 cgal-cpp>=5.0 - git submodule update --init python -m pip install --user -r .github/build-requirements.txt python -m pip install --user -r .github/test-requirements.txt displayName: 'Install build dependencies' - bash: | + source activate gudhi_build_env + git submodule update --init mkdir build cd build cmake -DCMAKE_BUILD_TYPE:STRING=$(CMakeBuildType) -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 .. -- cgit v1.2.3 From 71d958891cc638b26541ca5cf6c569b43332d2b6 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 4 May 2020 22:39:10 +0200 Subject: conda update and release cmake version --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2fcff411..b3b0ea7f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,6 +10,7 @@ jobs: matrix: Python36: python.version: '3.6' + CMakeBuildType: Release #Python37: # python.version: '3.7' #Python38: @@ -25,6 +26,7 @@ jobs: - bash: | source activate gudhi_build_env sudo conda install --yes --quiet --name gudhi_build_env python=$PYTHON_VERSION + sudo conda update --yes --quiet -n base -c defaults conda sudo conda install --yes -c conda-forge doxygen eigen boost-cpp=1.70.0 cgal-cpp>=5.0 python -m pip install --user -r .github/build-requirements.txt python -m pip install --user -r .github/test-requirements.txt -- cgit v1.2.3 From 03b8322e9ded09cc879867008d32baa3a91a45e5 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 5 May 2020 07:05:45 +0200 Subject: brew install cgal & Cie instead of conda install because of link issue --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b3b0ea7f..3ab2f112 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,6 +11,7 @@ jobs: Python36: python.version: '3.6' CMakeBuildType: Release + customInstallation: 'brew update && brew install graphviz doxygen boost eigen gmp mpfr tbb cgal' #Python37: # python.version: '3.7' #Python38: @@ -26,10 +27,9 @@ jobs: - bash: | source activate gudhi_build_env sudo conda install --yes --quiet --name gudhi_build_env python=$PYTHON_VERSION - sudo conda update --yes --quiet -n base -c defaults conda - sudo conda install --yes -c conda-forge doxygen eigen boost-cpp=1.70.0 cgal-cpp>=5.0 python -m pip install --user -r .github/build-requirements.txt python -m pip install --user -r .github/test-requirements.txt + $(customInstallation) displayName: 'Install build dependencies' - bash: | source activate gudhi_build_env -- cgit v1.2.3 From 8da9158e9a2ffb128eb1b5b05d4e8574ff70d771 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 5 May 2020 07:48:16 +0200 Subject: Remove sphinx test and matrix --- azure-pipelines.yml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3ab2f112..7b5334a7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,16 +6,10 @@ jobs: cancelTimeoutInMinutes: 60 pool: vmImage: macOS-10.14 - strategy: - matrix: - Python36: - python.version: '3.6' - CMakeBuildType: Release - customInstallation: 'brew update && brew install graphviz doxygen boost eigen gmp mpfr tbb cgal' - #Python37: - # python.version: '3.7' - #Python38: - # python.version: '3.8' + 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" @@ -26,7 +20,7 @@ jobs: - bash: | source activate gudhi_build_env - sudo conda install --yes --quiet --name gudhi_build_env python=$PYTHON_VERSION + 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) @@ -36,8 +30,8 @@ jobs: git submodule update --init mkdir build cd build - cmake -DCMAKE_BUILD_TYPE:STRING=$(CMakeBuildType) -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 .. - make + cmake -DCMAKE_BUILD_TYPE:STRING=$(cmakeBuildType) -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 .. + make -j 4 make doxygen - ctest -j 8 --output-on-failure # -E sphinx remove sphinx build as it fails + ctest -j 4 --output-on-failure -E sphinx # remove sphinx build as it fails displayName: 'Build, test and documentation generation' -- cgit v1.2.3