[geos-commits] [SCM] GEOS branch main updated. 701457b424a834b7da398d6abb60c642addce642
git at osgeo.org
git at osgeo.org
Mon Mar 9 08:54:47 PDT 2026
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 701457b424a834b7da398d6abb60c642addce642 (commit)
from 88a40b383ef4bb30fd72f8ac3f255bfc7060ead7 (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 701457b424a834b7da398d6abb60c642addce642
Author: Mike Taves <mwtoews at gmail.com>
Date: Tue Mar 10 04:54:25 2026 +1300
CI: update various GitHub Actions (#1392)
* CI: update various GitHub Actions
* Simplify run commands use use cmake -S . -B build
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 37b039887..5885f3b90 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -188,11 +188,10 @@ jobs:
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 v4
+ - uses: actions/checkout at v6
- name: Retrieve build cache
- uses: actions/cache/restore at v4
+ uses: actions/cache/restore at v5
id: restore-cache
with:
path: .ccache
@@ -205,8 +204,6 @@ jobs:
CXXFLAGS: "-m${{ matrix.ci.arch }}"
run: |
set -e
- mkdir build
- cd build
cmake --version
cmake ${{ matrix.ci.cmake_extra }} \
-D CMAKE_BUILD_TYPE=${{ matrix.ci.build_type }} \
@@ -215,13 +212,13 @@ jobs:
-D CMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} \
-D BUILD_DOCUMENTATION=YES \
-D USE_CCACHE=ON \
- ..
- make -j $(nproc)
- cmake --build . --target docs
+ -S . -B build
+ cmake --build build -j $(nproc)
+ cmake --build build --target docs
ccache --show-stats
- name: Save build cache
- uses: actions/cache/save at v4
+ uses: actions/cache/save at v5
with:
path: .ccache
key: ${{ steps.restore-cache.outputs.cache-primary-key }}
@@ -243,7 +240,7 @@ jobs:
- name: 'Upload Valgrind Log'
if: failure()
- uses: actions/upload-artifact at v4
+ uses: actions/upload-artifact at v7
with:
name: valgrind-log
path: build/Testing/Temporary/MemoryChecker.**.log
@@ -251,8 +248,8 @@ jobs:
- name: Generate coverage report
if: matrix.ci.build_type == 'Coverage'
+ working-directory: ./build
run: |
- cd build
lcov --ignore-errors=gcov,negative --capture --directory CMakeFiles --output-file coverage.info
- name: Upload Coverage to Codecov
@@ -275,8 +272,7 @@ jobs:
build_type: ['Debug', 'Release']
steps:
- - name: 'Check Out'
- uses: actions/checkout at v4
+ - uses: actions/checkout at v6
- name: 'Setup'
uses: msys2/setup-msys2 at v2
@@ -290,8 +286,8 @@ jobs:
mingw-w64-x86_64-gcc
- name: Retrieve build cache
+ uses: actions/cache/restore at v5
id: restore-cache
- uses: actions/cache/restore at v4
with:
path: .ccache
key: windows-mingw-${{ matrix.build_type}}-${{ github.ref_name }}-${{ github.run_id }}
@@ -301,19 +297,17 @@ jobs:
env:
CCACHE_DIR: ${{ github.workspace }}\.ccache
run: |
- mkdir build
- cd build
cmake --version
cmake \
-G "MSYS Makefiles" \
-D CMAKE_BUILD_TYPE=${{ matrix.build_type}} \
-D USE_CCACHE=ON \
- ..
- cmake --build . -j 4
+ -S . -B build
+ cmake --build build -j 4
ccache --show-stats --verbose
- name: Save build cache
- uses: actions/cache/save at v4
+ uses: actions/cache/save at v5
with:
path: .ccache
key: ${{ steps.restore-cache.outputs.cache-primary-key }}
@@ -334,16 +328,13 @@ jobs:
arch: arm64
steps:
- - name: 'Check Out'
- uses: actions/checkout at v4
+ - uses: actions/checkout at v6
# ccache not supported for this generator and/or Debug
- name: 'Build'
shell: cmd
run: |
- md build
- cd build
cmake --version
cmake ^
-G "Visual Studio 17 2022" ^
@@ -351,9 +342,9 @@ jobs:
-D CMAKE_BUILD_TYPE=Debug ^
-D CMAKE_CXX_STANDARD=17 ^
-D BUILD_SHARED_LIBS=ON ^
- ..
+ -S . -B build
IF %ERRORLEVEL% NEQ 0 exit /B 1
- cmake --build . --config Debug -j 4 -- /p:CL_MPcount=4
+ cmake --build build --config Debug -j 4 -- /p:CL_MPcount=4
- name: 'Test'
working-directory: build
@@ -378,12 +369,11 @@ jobs:
runs-on: ${{ matrix.ci.os }}
steps:
- - name: 'Check Out'
- uses: actions/checkout at v4
+ - uses: actions/checkout at v6
- name: Retrieve build cache
+ uses: actions/cache/restore at v5
id: restore-cache
- uses: actions/cache/restore at v4
with:
path: .ccache
key: msvc-ninja-${{ matrix.ci.os }}-${{ matrix.ci.cxxstd }}-${{ matrix.ci.arch }}-${{ github.ref_name }}-${{ github.run_id }}
@@ -402,8 +392,6 @@ jobs:
CCACHE_DIR: ${{ github.workspace }}\.ccache
shell: cmd
run: |
- md build
- cd build
cmake --version
cmake ^
-G Ninja ^
@@ -411,14 +399,14 @@ jobs:
-D CMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} ^
-D BUILD_SHARED_LIBS=ON ^
-D USE_CCACHE=ON ^
- ..
+ -S . -B build
IF %ERRORLEVEL% NEQ 0 exit /B 1
- cmake --build . --config Release -j 4
+ cmake --build build --config Release -j 4
IF %ERRORLEVEL% NEQ 0 exit /B 1
ccache --show-stats --verbose
- name: Save build cache
- uses: actions/cache/save at v4
+ uses: actions/cache/save at v5
with:
path: .ccache
key: ${{ steps.restore-cache.outputs.cache-primary-key }}
@@ -462,12 +450,11 @@ jobs:
which clang++
clang++ --version
- - name: 'Check Out'
- uses: actions/checkout at v4
+ - uses: actions/checkout at v6
- name: Retrieve build cache
+ uses: actions/cache/restore at v5
id: restore-cache
- uses: actions/cache/restore at v4
with:
path: .ccache
key: ${{ runner.os }}-${{ matrix.xcode }}-${{ matrix.build_type}}-${{ matrix.cxxstd }}-${{ github.ref_name }}-${{ github.run_id }}
@@ -476,19 +463,17 @@ jobs:
- name: 'Build'
run: |
set -e
- mkdir build
- cd build
cmake --version
cmake \
-D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-D CMAKE_CXX_STANDARD=${{ matrix.cxxstd }} \
-D USE_CCACHE=ON \
- ..
- cmake --build . --config ${{ matrix.build_type }} -j 4
+ -S . -B build
+ cmake --build build --config ${{ matrix.build_type }} -j 4
ccache --show-stats
- name: Save build cache
- uses: actions/cache/save at v4
+ uses: actions/cache/save at v5
with:
path: .ccache
key: ${{ steps.restore-cache.outputs.cache-primary-key }}
@@ -501,10 +486,10 @@ jobs:
name: FreeBSD
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout at v5
+ - uses: actions/checkout at v6
- name: Retrieve build cache
- uses: actions/cache/restore at v4
+ uses: actions/cache/restore at v5
id: restore-cache
with:
path: .ccache
@@ -523,16 +508,14 @@ jobs:
set -e
export CCACHE_DIR=$PWD/.ccache
cmake --version
- cmake -S . -B _build -D USE_CCACHE=ON ..
- cmake --build _build -j $(nproc)
+ cmake -S . -B build -D USE_CCACHE=ON
+ cmake --build build -j $(nproc)
ccache --show-stats
- cd _build
- ctest --output-on-failure
- cd ..
- rm -rf _build
+ (cd build && ctest --output-on-failure)
+ rm -rf build
- name: Save build cache
- uses: actions/cache/save at v4
+ uses: actions/cache/save at v5
with:
path: .ccache
key: ${{ steps.restore-cache.outputs.cache-primary-key }}
@@ -548,10 +531,10 @@ jobs:
sudo -E apt-get autopurge -y needrestart
sudo -E apt-get -yq --no-install-suggests --no-install-recommends install make cmake emscripten ccache
- - uses: actions/checkout at v5
+ - uses: actions/checkout at v6
- name: Retrieve build cache
- uses: actions/cache/restore at v4
+ uses: actions/cache/restore at v5
id: restore-cache
with:
path: .ccache
@@ -561,18 +544,16 @@ jobs:
- name: Build
run: |
set -e
- mkdir build
- cd build
cmake --version
emcmake cmake \
-D BUILD_SHARED_LIBS=OFF \
-D USE_CCACHE=ON \
- ..
- cmake --build . -j $(nproc)
+ -S . -B build
+ cmake --build build -j $(nproc)
ccache --show-stats
- name: Save build cache
- uses: actions/cache/save at v4
+ uses: actions/cache/save at v5
with:
path: .ccache
key: ${{ steps.restore-cache.outputs.cache-primary-key }}
@@ -592,8 +573,7 @@ jobs:
sudo -E apt-get -yq --no-install-suggests --no-install-recommends install cppcheck
python3 -m pip install --disable-pip-version-check --user codespell
- - name: 'Check Out'
- uses: actions/checkout at v4
+ - uses: actions/checkout at v6
- name: 'cppcheck'
run: ./tools/cppcheck.sh
@@ -616,8 +596,7 @@ jobs:
python3 -m pip install --disable-pip-version-check --user cmake==3.15.*
echo "$(python3 -m site --user-base)/bin" >> $GITHUB_PATH
- - name: 'Check Out'
- uses: actions/checkout at v4
+ - uses: actions/checkout at v6
with:
path: geos
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 556a2143e..46eb081ac 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -36,12 +36,11 @@ jobs:
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
steps:
- - name: Checkout repository
- uses: actions/checkout at v4
+ - uses: actions/checkout at v6
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init at v3
+ uses: github/codeql-action/init at v4
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,6 +63,6 @@ jobs:
make -j$(nproc)
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze at v3
+ uses: github/codeql-action/analyze at v4
with:
category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 0505fd9e1..07a0abb8c 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -22,14 +22,13 @@ jobs:
steps:
- - name: 'Check Out'
- uses: actions/checkout at v4
+ - uses: actions/checkout at v6
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action at v2
+ uses: docker/setup-buildx-action at v4
- name: Login to GitHub Container Registry
- uses: docker/login-action at v2
+ uses: docker/login-action at v4
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
@@ -40,7 +39,7 @@ jobs:
cp tools/ci/geosop/Dockerfile .
- name: Build and Push
- uses: docker/build-push-action at v4
+ uses: docker/build-push-action at v7
with:
context: .
# platforms: linux/amd64,linux/arm64
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0cd89dd4e..2edbafad7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,8 +32,7 @@ jobs:
uname -a
sudo -E apt-get -yq --no-install-suggests --no-install-recommends install make doxygen
- - name: 'Check Out'
- uses: actions/checkout at v4
+ - uses: actions/checkout at v6
- name: Get tag
id: tag
@@ -68,7 +67,7 @@ jobs:
- name: Create Release
if: ${{ steps.tag.outputs.tag == steps.version.outputs.geosversion }}
id: create_release
- uses: softprops/action-gh-release at v1
+ uses: softprops/action-gh-release at v2
with:
body_path: ${{ steps.notes.outputs.geosnotes }}
name: Release ${{ steps.version.outputs.geosversion }}
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index 7a14b534c..c059e4210 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -27,7 +27,7 @@ jobs:
sudo -E apt-get -yq --no-install-suggests --no-install-recommends install make doxygen
- name: 'Check Out 📗'
- uses: actions/checkout at v4
+ uses: actions/checkout at v6
- name: 'Hugo Build 🛠'
# ...or replace 'master' with a full version tag, such as: v0.64.1
@@ -51,7 +51,7 @@ jobs:
cp -ra build.cmake/doxygen/doxygen_docs/html/* public_html/doxygen
- name: 'Deploy 🚀'
- uses: JamesIves/github-pages-deploy-action at v4.4.1
+ uses: JamesIves/github-pages-deploy-action at v4
with:
branch: gh-pages # The branch the action should deploy to.
folder: public_html # The folder the action should deploy.
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/ci.yml | 101 ++++++++++++++++------------------------
.github/workflows/codeql.yml | 7 ++-
.github/workflows/container.yml | 9 ++--
.github/workflows/release.yml | 5 +-
.github/workflows/web.yml | 4 +-
5 files changed, 51 insertions(+), 75 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list