[geos-commits] [SCM] GEOS branch main updated. 4de45fed45ab21bd9045122702f38f6b9f03c1c4

git at osgeo.org git at osgeo.org
Tue Feb 6 16:19:50 PST 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, main has been updated
       via  4de45fed45ab21bd9045122702f38f6b9f03c1c4 (commit)
      from  45466da4c847a2e4e52eeb81732b26986645730b (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 4de45fed45ab21bd9045122702f38f6b9f03c1c4
Author: Even Rouault <even.rouault at spatialys.com>
Date:   Wed Feb 7 01:19:32 2024 +0100

    CI: increase -j to take into account that recently GitHub action workers have bumped to 4 vCPUs (#1044)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5ef5ef60b..45c46de12 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -248,7 +248,7 @@ jobs:
           -DUSE_CCACHE=ON \
           -DBUILD_DOCUMENTATION=YES \
           -DCMAKE_BUILD_TYPE=${{ matrix.ci.build_type }} ..
-        make -j 2
+        make -j $(nproc)
         cmake --build . --target docs
         ccache -s
 
@@ -329,7 +329,7 @@ jobs:
         -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
         -DUSE_CCACHE=ON \
         -G"MSYS Makefiles" ..
-       cmake --build . -j 2
+       cmake --build . -j 4
 
     - name: Save build cache
       uses: actions/cache/save at v3
@@ -377,7 +377,7 @@ jobs:
        cd build
        cmake --version
        cmake -DCMAKE_BUILD_TYPE=${{ matrix.ci.build_type }} -DCMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} -DBUILD_SHARED_LIBS=ON -DUSE_CCACHE=ON ..
-       cmake --build . --config ${{ matrix.ci.build_type }} -j 2
+       cmake --build . --config ${{ matrix.ci.build_type }} -j 4
 
     - name: Save build cache
       uses: actions/cache/save at v3
@@ -446,7 +446,7 @@ jobs:
           -DCMAKE_CXX_STANDARD=${CXX_STANDARD} \
           -DUSE_CCACHE=ON \
           -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..
-        cmake --build . --config ${BUILD_TYPE} -j 3
+        cmake --build . --config ${BUILD_TYPE} -j 4
 
     - name: Save build cache
       uses: actions/cache/save at v3
@@ -503,6 +503,6 @@ jobs:
         cp geos/examples/capi_read.c .
         cmake --version
         cmake -S . -B build
-        cmake --build build -j 2
+        cmake --build build -j $(nproc)
         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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list