diff options
| author | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-08-05 10:18:19 +0200 |
|---|---|---|
| committer | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-08-05 10:18:19 +0200 |
| commit | 2b4bf47e209225a56687b2a7fa65b27ef4b00ab2 (patch) | |
| tree | e876553cc2f8c18e0f504a33b26230d0e3e491ed /.circleci | |
| parent | 3253e504a0564bc75ffd4b1351e800593ffefd0f (diff) | |
| parent | 7fa45f4f0c7fb89abf64bc61b26a6201ace16a7a (diff) | |
Merge master and fix conflicts
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 90737006..e2df5c87 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,7 +58,7 @@ jobs: git submodule update mkdir build cd build - cmake -DUSER_VERSION_DIR=version .. + cmake -DWITH_GUDHI_THIRD_PARTY=OFF -DUSER_VERSION_DIR=version .. make user_version cd version cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 -DWITH_GUDHI_REMOTE_TEST=ON . @@ -79,7 +79,7 @@ jobs: doxygen: docker: - - image: gudhi/ci_for_gudhi:latest + - image: gudhi/doxygen_for_gudhi:latest steps: - checkout - run: @@ -89,15 +89,15 @@ jobs: git submodule update mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF -DUSER_VERSION_DIR=version .. + cmake -DWITH_GUDHI_THIRD_PARTY=OFF -DUSER_VERSION_DIR=version .. make user_version cd version mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF .. - make doxygen 2>&1 | tee dox.log - grep warning dox.log - cp dox.log html/ + cmake -DWITH_GUDHI_THIRD_PARTY=OFF .. + make doxygen + grep warning doxygen.log + cp doxygen.log html/ cp -R html /tmp/doxygen - store_artifacts: |