[geos-commits] [SCM] GEOS branch master updated. c0fd82567062272d9fda1dcb73f2d5417823961f

[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  c0fd82567062272d9fda1dcb73f2d5417823961f (commit)
       via  92b5a599c6a56a48454535b2a783288f9e2fc348 (commit)
      from  339f8caaa6e778dd579db70ca618018e4a8ca507 (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 c0fd82567062272d9fda1dcb73f2d5417823961f
Merge: 339f8ca 92b5a59
Author: Daniel Baston <dbaston at gmail.com>
Date:   Wed Mar 3 19:40:28 2021 -0500

    Merge remote-tracking branch 'mwtoews/ci-cmake'


commit 92b5a599c6a56a48454535b2a783288f9e2fc348
Author: Mike Taves <mwtoews at gmail.com>
Date:   Wed Mar 3 11:51:09 2021 +1300

    CI: add .local/bin to GITHUB_PATH; use make directly

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c4286eb..024b558 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
           cxxstd: 11,
           arch: 32,
           packages: 'g++-4.8-multilib gcc-4.8-multilib g++-multilib gcc-multilib',
-          cmake: 3.12.*,
+          cmake: 3.13.*,
           os: ubuntu-18.04
         }
         - {
@@ -78,6 +78,7 @@ jobs:
         sudo -E apt-get update
         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 }}
+        echo "$(python3 -m site --user-base)/bin" >> $GITHUB_PATH
 
     - name: 'Check Out'
       uses: actions/checkout at v2
@@ -92,7 +93,7 @@ jobs:
         cd build.cmake
         cmake --version
         cmake -DCMAKE_CXX_COMPILER=${{ matrix.ci.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} -DBUILD_DOCUMENTATION=YES -DCMAKE_BUILD_TYPE=${{ matrix.ci.build_type }} ..
-        cmake --build . -j 2
+        make -j 2
         cmake --build . --target docs
         ctest --output-on-failure .
 

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

Summary of changes:
 .github/workflows/ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS