[geos-commits] [SCM] GEOS branch 3.13 updated. 677de9abfebfae181154b18de4a6cae42266ad03

git at osgeo.org git at osgeo.org
Fri Feb 21 14:11:45 PST 2025


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, 3.13 has been updated
       via  677de9abfebfae181154b18de4a6cae42266ad03 (commit)
       via  c026a990883e26264d37b9e36c3624f670806a15 (commit)
      from  f92d697680a281f8cc26d5591b42ffa8efc7818b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 677de9abfebfae181154b18de4a6cae42266ad03
Merge: c026a9908 f92d69768
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Feb 21 14:11:21 2025 -0800

    Merge branch '3.13' of github.com:libgeos/geos into 3.13


commit c026a990883e26264d37b9e36c3624f670806a15
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Feb 21 14:10:40 2025 -0800

    Update CI for deprecated Ubuntu 20.04

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d98ec451b..1cf029285 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,56 +45,17 @@ jobs:
           cmake_extra: -D BUILD_BENCHMARKS=ON
           os: ubuntu-latest
 
-          # gcc 6 and lower are not supported
-          # in ubuntu 20.04 and higher
-
-        - cxx_compiler: g++-7
-          c_compiler: gcc-7
-          build_type: Release
-          cxxstd: 14
-          arch: 64
-          packages: 'g++-7-multilib gcc-7-multilib'
-          cmake: 3.17.*
-          os: ubuntu-20.04
-
-        - cxx_compiler: g++-7
-          c_compiler: gcc-7
-          build_type: Release
-          cxxstd: 14
-          arch: 32
-          packages: 'g++-7-multilib gcc-7-multilib g++-multilib gcc-multilib'
-          cmake: 3.18.*
-          os: ubuntu-20.04
-
-        - cxx_compiler: g++-8
-          c_compiler: gcc-8
-          build_type: Release
-          cxxstd: 14
-          arch: 64
-          packages: 'g++-8-multilib gcc-8-multilib'
-          cmake: 3.21.*
-          os: ubuntu-20.04
-
-        - cxx_compiler: g++-9
-          c_compiler: gcc-9
-          build_type: Release
-          cxxstd: 14
-          arch: 64
-          packages: 'g++-9-multilib gcc-9-multilib'
-          cmake: 3.23.*
-          os: ubuntu-20.04
+        # gcc 9 and lower are not supported
+        # in ubuntu 22.04 and higher
 
         - cxx_compiler: g++-10
           c_compiler: gcc-10
           build_type: Release
           cxxstd: 14
-          arch: 64
-          packages: 'g++-10-multilib gcc-10-multilib'
-          cmake: 3.25.*
-          os: ubuntu-20.04
-
-          # gcc 10 and lower are not supported
-          # in ubuntu 22.04 and higher
+          arch: 32
+          packages: 'g++-10-multilib gcc-10-multilib g++-multilib gcc-multilib'
+          cmake: 3.18.*
+          os: ubuntu-22.04
 
         - cxx_compiler: g++-11
           c_compiler: gcc-11
@@ -114,56 +75,29 @@ jobs:
           cmake: 3.29.*
           os: ubuntu-22.04
 
-        # - cxx_compiler: g++-13
-        #   c_compiler: gcc-13
-        #   build_type: Release
-        #   cxxstd: 17
-        #   arch: 64
-        #   packages: 'g++-13-multilib gcc-13-multilib'
-        #   cmake: 3.22.*
-        #   os: ubuntu-22.04
+        # gcc 12 and lower are not supported
+        # in ubuntu 24.04 and higher
 
-          # clang 6 and lower are not supported
-          # in ubuntu 20.04 and higher
-
-        - cxx_compiler: clang++-7
-          c_compiler: clang-7
+        - cxx_compiler: g++-13
+          c_compiler: gcc-13
           build_type: Release
-          cxxstd: 14
+          cxxstd: 20
           arch: 64
-          packages: 'clang-7'
-          cmake: 3.15.*
-          os: ubuntu-20.04
+          packages: 'g++-13-multilib gcc-13-multilib'
+          cmake: 3.25.*
+          os: ubuntu-24.04
 
-        - cxx_compiler: clang++-8
-          c_compiler: clang-8
+        - cxx_compiler: g++-14
+          c_compiler: gcc-14
           build_type: Release
-          cxxstd: 14
+          cxxstd: 20
           arch: 64
-          packages: 'clang-8'
-          cmake: 3.17.*
-          os: ubuntu-20.04
+          packages: 'g++-14-multilib gcc-14-multilib'
+          cmake: 3.31.*
+          os: ubuntu-24.04
 
-        - cxx_compiler: clang++-9
-          c_compiler: clang-9
-          build_type: Release
-          cxxstd: 14
-          arch: 64
-          packages: 'clang-9'
-          cmake: 3.20.*
-          os: ubuntu-20.04
-
-        - cxx_compiler: clang++-10
-          c_compiler: clang-10
-          build_type: Release
-          cxxstd: 14
-          arch: 64
-          packages: 'clang-10'
-          cmake: 3.21.*
-          os: ubuntu-20.04
-
-          # clang 10 and lower are not supported
-          # in ubuntu 22.04 and higher
+        # clang 10 and lower are not supported
+        # in ubuntu 22.04 and higher
 
         - cxx_compiler: clang++-11
           c_compiler: clang-11
@@ -542,7 +476,7 @@ jobs:
 
   cmake-subproject:
     name: 'CMake Subproject'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - name: 'Install'
       run: |
diff --git a/include/geos/geom/Envelope.h b/include/geos/geom/Envelope.h
index 823a0dc04..e64fdf8b1 100644
--- a/include/geos/geom/Envelope.h
+++ b/include/geos/geom/Envelope.h
@@ -590,7 +590,7 @@ public:
     * Tests if the region defined by other
     * is disjoint from the region of this Envelope
     *
-    * @param other  the Envelope being checked for disjointness
+    * @param other  the Envelope being checked for disjointedness
     * @return true if the Envelopes are disjoint
     */
     bool disjoint(const Envelope& other) const
diff --git a/src/operation/buffer/BufferBuilder.cpp b/src/operation/buffer/BufferBuilder.cpp
index 716215b71..1fa923ccb 100644
--- a/src/operation/buffer/BufferBuilder.cpp
+++ b/src/operation/buffer/BufferBuilder.cpp
@@ -377,7 +377,7 @@ BufferBuilder::buffer(const Geometry* g, double distance)
         std::vector< std::unique_ptr<Geometry> > geoms_to_delete;
         for ( size_t i=0, n=g->getNumGeometries(); i<n; ++i )
         {
-            // BufferBuilder class cannot be re-used, so
+            // BufferBuilder class cannot be reused, so
             // we create a new one for each subgeom
             BufferBuilder subbuilder(bufParams);
             const Geometry *subgeom = g->getGeometryN(i);

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/ci.yml | 112 ++++++++++-------------------------------------
 1 file changed, 23 insertions(+), 89 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list