[geos-commits] [SCM] GEOS branch master updated. 47977bc22bacac44817882da71c5975adee6d397

[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, master has been updated
       via  47977bc22bacac44817882da71c5975adee6d397 (commit)
       via  5cbd30a29a72e6a236b79cd47e492c6b93a81e24 (commit)
      from  c6abbf9f980bd21d4a0ce2818bc0480a4707afc9 (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 47977bc22bacac44817882da71c5975adee6d397
Merge: c6abbf9 5cbd30a
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Mar 2 14:47:08 2021 -0800

    Merge branch 'mwtoews-ci-cmake'


commit 5cbd30a29a72e6a236b79cd47e492c6b93a81e24
Author: Mike Taves <mwtoews at gmail.com>
Date:   Wed Mar 3 11:26:55 2021 +1300

    CI: use different versions of CMake in GitHub Actions matrix

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b901f52..c4286eb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,8 @@ jobs:
           build_type: Coverage,
           cxxstd: 11,
           arch: 64,
-          packages: 'g++ cmake doxygen',
+          packages: 'g++',
+          cmake: 3.15.*,
           os: ubuntu-18.04
         }
         - {
@@ -25,7 +26,8 @@ jobs:
           build_type: Release,
           cxxstd: 11,
           arch: 32,
-          packages: 'g++-4.8-multilib gcc-4.8-multilib g++-multilib gcc-multilib cmake doxygen',
+          packages: 'g++-4.8-multilib gcc-4.8-multilib g++-multilib gcc-multilib',
+          cmake: 3.12.*,
           os: ubuntu-18.04
         }
         - {
@@ -33,7 +35,8 @@ jobs:
           build_type: Release,
           cxxstd: 11,
           arch: 64,
-          packages: 'clang cmake doxygen',
+          packages: 'clang',
+          cmake: 3.10.*,
           os: ubuntu-18.04
         }
         - {
@@ -41,7 +44,8 @@ jobs:
           build_type: Debug,
           cxxstd: 11,
           arch: 64,
-          packages: 'g++ cmake doxygen',
+          packages: 'g++',
+          cmake: 3.15.*,
           os: ubuntu-20.04
         }
         - {
@@ -49,7 +53,8 @@ jobs:
           build_type: Release,
           cxxstd: 11,
           arch: 64,
-          packages: 'clang cmake doxygen',
+          packages: 'clang',
+          cmake: 3.8.*,
           os: ubuntu-16.04
         }
         - {
@@ -57,7 +62,8 @@ jobs:
           build_type: Release,
           cxxstd: 14,
           arch: 64,
-          packages: 'clang cmake doxygen',
+          packages: 'clang',
+          cmake: 3.17.*,
           os: ubuntu-20.04
         }
 
@@ -70,7 +76,8 @@ jobs:
         set -e
         uname -a
         sudo -E apt-get update
-        sudo -E apt-get -yq --no-install-suggests --no-install-recommends install make ${{ matrix.ci.packages }}
+        sudo -E apt-get -yq --no-install-suggests --no-install-recommends install make doxygen python3-pip ${{ matrix.ci.packages }}
+        python3 -m pip install --disable-pip-version-check --user cmake==${{ matrix.ci.cmake }}
 
     - name: 'Check Out'
       uses: actions/checkout at v2

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

Summary of changes:
 .github/workflows/ci.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GEOS