[geos-commits] [SCM] GEOS branch 3.11 updated. c1534c4c4758852b12c84072a9da7e5d7e803b9e

[git at osgeo.org]

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.11 has been updated
       via  c1534c4c4758852b12c84072a9da7e5d7e803b9e (commit)
       via  76549273444a110343d9bc691eeaabbf2440b942 (commit)
      from  0bb7c64df714be5772671b27726de45f2553d40f (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 c1534c4c4758852b12c84072a9da7e5d7e803b9e
Merge: 765492734 0bb7c64df
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Feb 21 14:50:44 2025 -0800

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


commit 76549273444a110343d9bc691eeaabbf2440b942
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Feb 21 14:50:20 2025 -0800

    Update CI for Ubuntu 20.04 deprecation

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a5152fbc5..06f3f7b95 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,63 +15,66 @@ jobs:
   linux:
     name: 'Linux'
     strategy:
+      fail-fast: false
       matrix:
         ci:
-        - {
-          compiler: g++,
-          build_type: Coverage,
-          cxxstd: 11,
-          arch: 64,
-          packages: 'g++',
-          cmake: 3.15.*,
-          cmake_extra: '-DBUILD_BENCHMARKS=ON',
-          os: ubuntu-20.04
-        }
-        # - {
-        #   compiler: g++,
-        #   build_type: Release,
-        #   cxxstd: 11,
-        #   arch: 32,
-        #   packages: 'g++-4.8-multilib gcc-4.8-multilib g++-multilib gcc-multilib',
-        #   cmake: 3.13.*,
-        #   os: ubuntu-20.04
-        # }
-        - {
-          compiler: clang++,
-          build_type: Release,
-          cxxstd: 11,
-          arch: 64,
-          packages: 'clang',
-          cmake: 3.13.*,
-          os: ubuntu-20.04
-        }
-        - {
-          compiler: clang++,
-          build_type: Debug,
-          cxxstd: 11,
-          arch: 64,
-          packages: 'clang',
-          cmake: 3.17.*,
-          os: ubuntu-20.04,
-        }
-        - {
-          compiler: clang++,
-          build_type: Release,
-          cxxstd: 14,
-          arch: 64,
-          packages: 'clang',
-          cmake: 3.17.*,
-          os: ubuntu-20.04
-        }
-        - {
-          compiler: g++,
-          build_type: Release,
-          cxxstd: 11,
-          arch: 64,
-          packages: 'g++',
-          cmake: 3.22.*,
+        - compiler: g++
+          build_type: Coverage
+          cxxstd: 11
+          arch: 64
+          packages: 'g++'
+          cmake: 3.15.*
+          cmake_extra: '-DBUILD_BENCHMARKS=ON'
+          os: ubuntu-latest
+
+        - compiler: g++
+          build_type: Debug
+          cxxstd: 11
+          arch: 64
+          packages: 'g++'
+          cmake: 3.15.*
+          os: ubuntu-latest
+
+        - compiler: g++-10
+          build_type: Release
+          cxxstd: 17
+          arch: 64
+          packages: 'g++-10-multilib gcc-10-multilib'
+          cmake: 3.15.*
           os: ubuntu-22.04
-        }
+
+        - compiler: g++-11
+          build_type: Release
+          cxxstd: 17
+          arch: 64
+          packages: 'g++-11-multilib gcc-11-multilib'
+          cmake: 3.17.*
+          os: ubuntu-22.04
+
+        - compiler: clang++
+          build_type: Release
+          cxxstd: 11
+          arch: 64
+          packages: 'clang'
+          cmake: 3.15.*
+          os: ubuntu-22.04
+
+        - compiler: clang++
+          build_type: Release
+          cxxstd: 14
+          arch: 64
+          packages: 'clang'
+          cmake: 3.17.*
+          os: ubuntu-22.04
+
+        - compiler: g++
+          build_type: Release
+          cxxstd: 17
+          arch: 64
+          packages: 'g++'
+          cmake: 3.22.*
+          os: ubuntu-22.04
+
 
     runs-on: ${{ matrix.ci.os }}
     steps:
@@ -232,51 +235,3 @@ jobs:
        cd build
        ctest --output-on-failure -C Release
 
-  # windows-msvc-17:
-  #   name: 'Windows (Visual Studio 2017, Release, windows-2016)'
-  #   runs-on: windows-2016
-  #   steps:
-  #   - name: 'Check Out'
-  #     uses: actions/checkout at v4
-
-  #   - name: 'Build'
-  #     run: |
-  #      mkdir build
-  #      cd build
-  #      cmake --version
-  #      cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=11 -DBUILD_SHARED_LIBS=ON ..
-  #      cmake --build . --config Release -j 2
-
-  #   - name: 'Test'
-  #     run: |
-  #      cd build
-  #      ctest --output-on-failure -C Release
-
-  cmake-subproject:
-    name: 'CMake Subproject'
-    runs-on: ubuntu-20.04
-    steps:
-    - name: 'Install'
-      run: |
-        set -e
-        uname -a
-        sudo -E apt-get update
-        sudo -E apt-get -yq --no-install-suggests --no-install-recommends install make python3-pip g++
-        python3 -m pip install --disable-pip-version-check --user cmake==3.13.*
-        echo "$(python3 -m site --user-base)/bin" >> $GITHUB_PATH
-
-    - name: 'Check Out'
-      uses: actions/checkout at v4
-      with:
-        path: geos
-
-    - name: 'CMake Superbuild'
-      run: |
-        set -e
-        cp geos/tests/superbuild.CMakeLists.txt ./CMakeLists.txt
-        cp geos/examples/capi_read.c .
-        cmake --version
-        cmake -S . -B build
-        cmake --build build -j 2
-        build/capi_read
-        test ! -f build/geos/bin/test_geos_unit || { echo "Error: GEOS tests were built" 1>&2 ; exit 1; }

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

Summary of changes:
 .github/workflows/ci.yml | 159 +++++++++++++++++------------------------------
 1 file changed, 57 insertions(+), 102 deletions(-)


hooks/post-receive
-- 
GEOS