Merge branch 'master' into update_functions

mthh · Nov 1, 2024 · 6d75148 · 6d75148
2 parents d2402be + 3332740
commit 6d75148
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 7 deletions.
diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml
@@ -1,16 +1,15 @@
 on:
   push:
     tags:
-      - '*'
-  pull_request:
+      - "v*.*.*"
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 name: Build documentation on new release
 jobs:
   doc:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,9 +7,16 @@ on:
 name: Build and run tests
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        rust:
+          - stable
+          - beta
+          - nightly
     steps:
       - uses: actions/checkout@v3
+
       - 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
@@ -18,4 +25,30 @@ jobs:
           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
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+          components: rustfmt, clippy
+
+      - uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --all-features
+
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features
+
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+      - uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: -- -D warnings
diff --git a/src/geometry.rs b/src/geometry.rs
@@ -622,7 +622,7 @@ impl SFCGeometry {
         unsafe { SFCGeometry::new_from_raw(result, true) }
     }
 
-    /// Tests the coverage of geom1 and geom2
+    ///
     pub fn covers(&self, other: &SFCGeometry) -> Result<bool> {
         precondition_match_validity!(self);
         precondition_match_validity_other!(other);
@@ -631,7 +631,7 @@ impl SFCGeometry {
         check_predicate(rv)
     }
 
-    /// Tests the 3D coverage of geom1 and geom2
+    ///
     pub fn covers_3d(&self, other: &SFCGeometry) -> Result<bool> {
         precondition_match_validity!(self);
         precondition_match_validity_other!(other);