[geos-commits] [SCM] GEOS branch 3.7 updated. 81bff22258238d4fd5885bcbdcfefc7507f94280

git at osgeo.org git at osgeo.org
Tue Jul 6 12:01:17 PDT 2021


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.7 has been updated
       via  81bff22258238d4fd5885bcbdcfefc7507f94280 (commit)
      from  51dd077734cab54127b5831d4c83794ce7efbcbf (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 81bff22258238d4fd5885bcbdcfefc7507f94280
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Jul 6 12:01:12 2021 -0700

    Remove dead cmake code

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19988b0..9fde6dc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,24 +50,12 @@ jobs:
     - name: 'Build'
       run: |
         set -e
-        if [ ${{ matrix.ci.build }} == 'cmake' ];
-        then
-          mkdir build.cmake
-          cd build.cmake
-          cmake --version
-          cmake -DCMAKE_CXX_COMPILER=${{ matrix.ci.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} -DBUILD_DOCUMENTATION=YES -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
-          make
-          cmake --build . --target docs
-          ctest --output-on-failure .
-        else
-          set -e
-          ./autogen.sh
-          mkdir build.autotools
-          cd build.autotools
-          CFLAGS="-std=c++${{ matrix.ci.cxxstd }} -m${{ matrix.ci.arch }}"
-          ../configure CC=${{ matrix.ci.compiler }} CXX=${{ matrix.ci.compiler }} CXXFLAGS="$CFLAGS" CFLAGS="$CFLAGS"
-          make && make check && make distcheck
-        fi
+        ./autogen.sh
+        mkdir build.autotools
+        cd build.autotools
+        export CFLAGS="-std=c++${{ matrix.ci.cxxstd }} -m${{ matrix.ci.arch }}"
+        ../configure CC=${{ matrix.ci.compiler }} CXX=${{ matrix.ci.compiler }} CXXFLAGS="$CFLAGS" CFLAGS="$CFLAGS"
+        make && make check && make distcheck
 
 
 

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

Summary of changes:
 .github/workflows/ci.yml | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list