From bfb50e2d81261248df375f350562c7ae6c85de72 Mon Sep 17 00:00:00 2001 From: Matthieu Viry Date: Tue, 16 Apr 2024 18:09:44 +0200 Subject: [PATCH] Update dependencies and ci configuration --- .github/workflows/build_doc.yml | 13 +++++++------ .github/workflows/test.yml | 11 +++++++---- Cargo.toml | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index 98a2176..cbf45b6 100644 --- 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 "" > target/doc/index.html diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b76ee96..d2f9fe1 100644 --- 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 index 414a8ec..2fc195e 100644 --- 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"