[geos-commits] [SCM] GEOS branch 3.12 updated. 0402c861bd32fdb58e6fa9c4a8574eac95520238

git at osgeo.org git at osgeo.org
Mon Oct 28 13:18:33 PDT 2024


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.12 has been updated
       via  0402c861bd32fdb58e6fa9c4a8574eac95520238 (commit)
      from  4dc7242b2c1b2d64bee7a950dc13b617357771f3 (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 0402c861bd32fdb58e6fa9c4a8574eac95520238
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Oct 28 13:17:58 2024 -0700

    Macos CI tweaks

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 35436244e..81d61b36e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -395,6 +395,7 @@ jobs:
           build_type: Release
           runs_on: macOS-15
 
+    runs-on: ${{ matrix.runs_on }}
     steps:
 
     - name: 'Setup'
@@ -423,19 +424,18 @@ jobs:
         restore-keys: ${{ runner.os }}-${{ matrix.xcode }}-${{ matrix.build_type}}-${{ matrix.cxxstd }}
 
     - name: 'Build'
-      env:
-        BUILD_TYPE: ${{ matrix.build_type }}
-        CXX_STANDARD: ${{ matrix.cxxstd }}
       run: |
         set -e
         mkdir build
         cd build
         cmake --version
         cmake \
-          -DCMAKE_CXX_STANDARD=${CXX_STANDARD} \
-          -DUSE_CCACHE=ON \
-          -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..
-        cmake --build . --config ${BUILD_TYPE} -j 3
+          -D CMAKE_CXX_STANDARD=${{ matrix.cxxstd }} \
+          -D USE_CCACHE=ON \
+          -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+          ..
+        cmake --build . --config ${{ matrix.build_type }} -j 4
+        ccache --show-stats
 
     - name: Save build cache
       uses: actions/cache/save at v4
@@ -446,7 +446,7 @@ jobs:
     - name: 'Test'
       run: |
         cd build
-        ctest -V --output-on-failure -C ${BUILD_TYPE}
+        ctest -V --output-on-failure -C ${{ matrix.build_type }}
 
 
   code-quality:

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

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


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list