Update dependencies and ci configuration

mthh · Apr 16, 2024 · bfb50e2 · bfb50e2
1 parent e6bc0be
commit bfb50e2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml
@@ -2,7 +2,6 @@ on:
   push:
     tags:
       - '*'
-  pull_request:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -14,11 +13,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: |
-          sudo apt-get install -y libcgal-dev libboost1.74-all-dev libmpfr-dev libgmp-dev cmake wget unzip clang libstdc++-11-dev
-          wget https://gitlab.com/Oslandia/SFCGAL/-/archive/v1.4.1/SFCGAL-v1.4.1.zip
-          unzip SFCGAL-v1.4.1.zip
-          cd SFCGAL-v1.4.1 && cmake -DCMAKE_INSTALL_PREFIX=/usr . && make && sudo make install && cd ..
-      - run: cargo test --all-features
+          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
+          tar -xf CGAL-5.6.1-library.tar.xz
+          unzip SFCGAL-v1.5.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 doc
           echo "<meta http-equiv=refresh content=0;url=sfcgal_sys/index.html>" > target/doc/index.html

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,8 +11,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: |
-          sudo apt-get install -y libcgal-dev libboost1.74-all-dev libmpfr-dev libgmp-dev cmake wget unzip clang libstdc++-11-dev
-          wget https://gitlab.com/Oslandia/SFCGAL/-/archive/v1.4.1/SFCGAL-v1.4.1.zip
-          unzip SFCGAL-v1.4.1.zip
-          cd SFCGAL-v1.4.1 && cmake -DCMAKE_INSTALL_PREFIX=/usr . && make && sudo make install && cd ..
+          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
+          tar -xf CGAL-5.6.1-library.tar.xz
+          unzip SFCGAL-v1.5.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/Cargo.toml b/Cargo.toml
@@ -15,5 +15,5 @@ repository = "https://github.com/mthh/sfcgal-sys"
 categories = ["external-ffi-bindings"]
 
 [build-dependencies]
-bindgen = "0.64.0"
+bindgen = "0.69"
 cc = "1.0"