From 648c97885e7635fd2c6e63f476a1e1caf8f863e0 Mon Sep 17 00:00:00 2001 From: Matthieu Viry Date: Wed, 13 Nov 2024 22:29:29 +0100 Subject: [PATCH] Update CI workflows for sfcgal 2.0 --- .github/workflows/build_doc.yml | 4 ++-- .github/workflows/test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index 2d1e880eb..9be2e0466 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/build_doc.yml @@ -15,9 +15,9 @@ jobs: - run: | sudo apt-get install -y libboost1.74-all-dev libmpfr-dev libgmp-dev cmake wget unzip clang libstdc++-11-dev wget https://github.com/CGAL/cgal/releases/download/v5.6.1/CGAL-5.6.1-library.tar.xz - wget https://gitlab.com/SFCGAL/SFCGAL/-/archive/v1.5.0/SFCGAL-v1.5.0.zip + wget https://gitlab.com/SFCGAL/SFCGAL/-/archive/v2.0.0/SFCGAL-v2.0.0.zip tar -xf CGAL-5.6.1-library.tar.xz - unzip SFCGAL-v1.5.0.zip + unzip SFCGAL-v2.0.0.zip cd CGAL-5.6.1 && cmake . && sudo make install && cd .. cd $(ls -d */ | grep SFC) && cmake -DCMAKE_INSTALL_PREFIX=/usr . && make && sudo make install && cd .. - run: cargo test --all-features diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b7aa74a1f..e44a6ba24 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,9 +20,9 @@ jobs: - run: | sudo apt-get install -y libboost1.74-all-dev libmpfr-dev libgmp-dev cmake wget unzip clang libstdc++-11-dev wget https://github.com/CGAL/cgal/releases/download/v5.6.1/CGAL-5.6.1-library.tar.xz - wget https://gitlab.com/SFCGAL/SFCGAL/-/archive/v1.5.0/SFCGAL-v1.5.0.zip + wget https://gitlab.com/SFCGAL/SFCGAL/-/archive/v2.0.0/SFCGAL-v2.0.0.zip tar -xf CGAL-5.6.1-library.tar.xz - unzip SFCGAL-v1.5.0.zip + unzip SFCGAL-v2.0.0.zip cd CGAL-5.6.1 && cmake . && sudo make install && cd .. cd $(ls -d */ | grep SFC) && cmake -DCMAKE_INSTALL_PREFIX=/usr . && make && sudo make install && cd ..