Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New docker images to fix debug_tests with ubuntu 24. Now works in a virtual env #1160

Merged
merged 2 commits into from
Dec 4, 2024
Merged

New docker images to fix debug_tests with ubuntu 24. Now works in a virtual env #1160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34bf483
New docker images to fix debug_tests with ubuntu 24. Now works in a v…
VincentRouvreau Dec 4, 2024
7de6aad
cmake requires build dir
VincentRouvreau Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 53 additions & 25 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
examples:
docker:
# cf. https://github.com/GUDHI/gudhi-deploy/blob/main/Dockerfile_for_circleci_image
- image: gudhi/ci_for_gudhi:2024.10.01
- image: gudhi/ci_for_gudhi:2024.12.01
steps:
- checkout
- run:
Expand All @@ -24,7 +24,7 @@ jobs:

tests:
docker:
- image: gudhi/ci_for_gudhi:2024.10.01
- image: gudhi/ci_for_gudhi:2024.12.01
steps:
- checkout
- run:
Expand All @@ -43,7 +43,7 @@ jobs:

debug_tests:
docker:
- image: gudhi/ci_for_gudhi:2024.10.01
- image: gudhi/ci_for_gudhi:2024.12.01
steps:
- checkout
- run:
Expand All @@ -62,7 +62,7 @@ jobs:

utils:
docker:
- image: gudhi/ci_for_gudhi:2024.10.01
- image: gudhi/ci_for_gudhi:2024.12.01
steps:
- checkout
- run:
Expand All @@ -81,7 +81,7 @@ jobs:

python:
docker:
- image: gudhi/ci_for_gudhi:2024.10.01
- image: gudhi/ci_for_gudhi:2024.12.01
resource_class: large # Delaunay complex requires about 5 Gb of RAM to compile
steps:
- checkout
Expand All @@ -100,13 +100,13 @@ jobs:
cd version
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DWITH_GUDHI_REMOTE_TEST=ON .
cd python
python3 setup.py build_ext --inplace
python setup.py build_ext --inplace
ctest --output-on-failure
make sphinx
cp -R sphinx /tmp/sphinx
python3 setup.py install
python3 setup.py clean --all
python3 -B -m pytest test/*.py --cov-report html --cov=gudhi
python setup.py install
python setup.py clean --all
python -B -m pytest test/*.py --cov-report html --cov=gudhi
cp -R htmlcov /tmp/htmlcov
- store_artifacts:
path: /tmp/sphinx
Expand All @@ -117,7 +117,7 @@ jobs:

doxygen:
docker:
- image: gudhi/doxygen_for_gudhi:2024.10.01
- image: gudhi/doxygen_for_gudhi:2024.12.01
steps:
- checkout
- run:
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:

bibliography:
docker:
- image: gudhi/doxygen_for_gudhi:2024.10.01
- image: gudhi/doxygen_for_gudhi:2024.12.01
steps:
- checkout
- run:
Expand All @@ -170,7 +170,7 @@ jobs:
examples_without_cgal_eigen:
docker:
# cf. https://github.com/GUDHI/gudhi-deploy/blob/main/Dockerfile_for_circleci_image_without_cgal
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
steps:
- checkout
- run:
Expand All @@ -189,7 +189,7 @@ jobs:

tests_without_cgal_eigen:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
steps:
- checkout
- run:
Expand All @@ -208,7 +208,7 @@ jobs:

utils_without_cgal_eigen:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
steps:
- checkout
- run:
Expand All @@ -227,7 +227,7 @@ jobs:

python_without_cgal_eigen:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
steps:
- checkout
- run:
Expand All @@ -242,14 +242,14 @@ jobs:
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON ..
cd src/python
python3 setup.py build_ext --inplace
python setup.py build_ext --inplace
ctest --output-on-failure

### With all third parties, except CGAL

examples_without_cgal:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
steps:
- checkout
- run:
Expand All @@ -260,15 +260,22 @@ jobs:
- run:
name: Build and test examples without cgal
command: |
cur_dir=`pwd`
cd /eigen-3.4.0
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DEIGEN3_INCLUDE_DIR=/eigen-3.3.9 -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF ..
cmake ..
make install
cd $cur_dir
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF ..
make all
ctest --output-on-failure

tests_without_cgal:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
steps:
- checkout
- run:
Expand All @@ -279,15 +286,22 @@ jobs:
- run:
name: Build and test unitary tests without cgal
command: |
cur_dir=`pwd`
cd /eigen-3.4.0
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DEIGEN3_INCLUDE_DIR=/eigen-3.3.9 -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF ..
cmake ..
make install
cd $cur_dir
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF ..
make all
ctest --output-on-failure

utils_without_cgal:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
steps:
- checkout
- run:
Expand All @@ -298,15 +312,22 @@ jobs:
- run:
name: Build and test utilities without cgal
command: |
cur_dir=`pwd`
cd /eigen-3.4.0
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DEIGEN3_INCLUDE_DIR=/eigen-3.3.9 -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF ..
cmake ..
make install
cd $cur_dir
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF ..
make all
ctest --output-on-failure

python_without_cgal:
docker:
- image: gudhi/ci_for_gudhi_wo_cgal:2024.10.01
- image: gudhi/ci_for_gudhi_wo_cgal:2024.12.01
steps:
- checkout
- run:
Expand All @@ -317,11 +338,18 @@ jobs:
- run:
name: Build and test python module without cgal
command: |
cur_dir=`pwd`
cd /eigen-3.4.0
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DEIGEN3_INCLUDE_DIR=/eigen-3.3.9 -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON ..
cmake ..
make install
cd $cur_dir
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON ..
cd src/python
python3 setup.py build_ext --inplace
python setup.py build_ext --inplace
ctest --output-on-failure

workflows:
Expand Down
Loading