[geos-commits] [SCM] GEOS branch main updated. 18e84710f1cd9e41e78875a09c251a792e0ac536
git at osgeo.org
git at osgeo.org
Thu Jun 20 10:00:01 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, main has been updated
via 18e84710f1cd9e41e78875a09c251a792e0ac536 (commit)
via fb3c0202f849c66d9e2d33fdc1c71adf60989a9b (commit)
via ac1d92432ea887a06864fd66283546724ca8caa1 (commit)
from 451e615ae0d9d54fbdbb8352a9aa755c0ed90419 (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 18e84710f1cd9e41e78875a09c251a792e0ac536
Author: Mike Taves <mwtoews at gmail.com>
Date: Fri Jun 21 04:59:42 2024 +1200
CI: show ccache stats, use Ninja for MSVC, misc. reformat (#1118)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 63fc69864..9f2c95f82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
arch: 64
packages: g++
cmake: 3.15.*
- cmake_extra: '-DBUILD_BENCHMARKS=ON'
+ cmake_extra: -D BUILD_BENCHMARKS=ON
os: ubuntu-latest
# gcc 6 and lower are not supported
@@ -218,6 +218,7 @@ jobs:
set -e
uname -a
sudo -E apt-get update
+ sudo -E apt-get autopurge -y needrestart
sudo -E apt-get -yq --no-install-suggests --no-install-recommends install make doxygen python3-pip ccache valgrind ${{ 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
@@ -239,19 +240,20 @@ jobs:
CXXFLAGS: "-m${{ matrix.ci.arch }}"
run: |
set -e
- mkdir build.cmake
- cd build.cmake
+ mkdir build
+ cd build
cmake --version
cmake ${{ matrix.ci.cmake_extra }} \
- -DCMAKE_C_COMPILER=${{ matrix.ci.c_compiler }} \
- -DCMAKE_CXX_COMPILER=${{ matrix.ci.cxx_compiler }} \
- -DCMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} \
- -DUSE_CCACHE=ON \
- -DBUILD_DOCUMENTATION=YES \
- -DCMAKE_BUILD_TYPE=${{ matrix.ci.build_type }} ..
+ -D CMAKE_BUILD_TYPE=${{ matrix.ci.build_type }} \
+ -D CMAKE_C_COMPILER=${{ matrix.ci.c_compiler }} \
+ -D CMAKE_CXX_COMPILER=${{ matrix.ci.cxx_compiler }} \
+ -D CMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} \
+ -D BUILD_DOCUMENTATION=YES \
+ -D USE_CCACHE=ON \
+ ..
make -j $(nproc)
cmake --build . --target docs
- ccache -s
+ ccache --show-stats
- name: Save build cache
uses: actions/cache/save at v4
@@ -260,19 +262,16 @@ jobs:
key: ${{ steps.restore-cache.outputs.cache-primary-key }}
- name: Test
- run: |
- set -e
- cd build.cmake
- ctest --output-on-failure .
+ working-directory: ./build
+ run: ctest --output-on-failure
# Run the all-unit-tests under
# the memory checker when we have Debug symbols
# available. Change to ^all to also check all-xml-tests
- name: Valgrind
if: matrix.ci.build_type == 'Debug'
+ working-directory: ./build
run: |
- set -e
- cd build.cmake
ctest --output-on-failure \
--overwrite MemoryCheckCommandOptions="--leak-check=full --error-exitcode=100" \
-R ^all-unit -C Valgrind -T memcheck
@@ -282,7 +281,7 @@ jobs:
uses: actions/upload-artifact at v2
with:
name: valgrind-log
- path: build.cmake/Testing/Temporary/MemoryChecker.**.log
+ path: build/Testing/Temporary/MemoryChecker.**.log
retention-days: 1
- name: Upload Coverage to Codecov
@@ -310,8 +309,13 @@ jobs:
- name: 'Setup'
uses: msys2/setup-msys2 at v2
with:
- install: mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake make mingw-w64-x86_64-ccache
+ msystem: MINGW64
update: true
+ install: >-
+ make
+ mingw-w64-x86_64-ccache
+ mingw-w64-x86_64-cmake
+ mingw-w64-x86_64-gcc
- name: Retrieve build cache
id: restore-cache
@@ -322,16 +326,19 @@ jobs:
restore-keys: windows-mingw-${{ matrix.build_type}}
- name: 'Build'
+ env:
+ CCACHE_DIR: ${{ github.workspace }}\.ccache
run: |
- export CCACHE_BASE_DIR=$(pwd)
- mkdir build
- cd build
- cmake --version
- cmake \
- -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
- -DUSE_CCACHE=ON \
- -G"MSYS Makefiles" ..
- cmake --build . -j 4
+ 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
+ ccache --show-stats --verbose
- name: Save build cache
uses: actions/cache/save at v4
@@ -340,9 +347,8 @@ jobs:
key: ${{ steps.restore-cache.outputs.cache-primary-key }}
- name: 'Test'
- run: |
- cd build
- ctest --output-on-failure .
+ working-directory: ./build
+ run: ctest --output-on-failure
windows-msvc:
name: 'Windows (Visual Studio)'
@@ -353,10 +359,12 @@ jobs:
- build_type: Debug
cxxstd: 14
os: windows-2022
+ vcdir: C:\Program Files\Microsoft Visual Studio\2022\Enterprise
- build_type: Release
cxxstd: 14
os: windows-2019
+ vcdir: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise
runs-on: ${{ matrix.ci.os }}
steps:
@@ -364,23 +372,34 @@ jobs:
uses: actions/checkout at v4
- name: 'Setup'
- run: choco install ccache
+ run: choco install ccache ninja
- name: Retrieve build cache
id: restore-cache
uses: actions/cache/restore at v4
with:
path: .ccache
- key: windows-msvc-${{ matrix.build_type}}-${{ github.ref_name }}-${{ github.run_id }}
- restore-keys: windows-msvc-${{ matrix.build_type}}
+ key: windows-msvc-${{ matrix.ci.os}}-${{ matrix.ci.build_type}}-${{ github.ref_name }}-${{ github.run_id }}
+ restore-keys: windows-msvc-${{ matrix.ci.os}}-${{ matrix.ci.build_type}}
- name: 'Build'
+ env:
+ CCACHE_DIR: ${{ github.workspace }}\.ccache
+ shell: cmd
run: |
- mkdir build
- 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 4
+ call "${{ matrix.ci.vcdir }}\VC\Auxiliary\Build\vcvars64.bat"
+ md build
+ cd build
+ cmake --version
+ cmake ^
+ -G Ninja ^
+ -D CMAKE_BUILD_TYPE=${{ matrix.ci.build_type }} ^
+ -D CMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} ^
+ -D BUILD_SHARED_LIBS=ON ^
+ -D USE_CCACHE=ON ^
+ ..
+ cmake --build . --config ${{ matrix.ci.build_type }} -j 4
+ ccache --show-stats --verbose
- name: Save build cache
uses: actions/cache/save at v4
@@ -389,9 +408,8 @@ jobs:
key: ${{ steps.restore-cache.outputs.cache-primary-key }}
- name: 'Test'
- run: |
- cd build
- ctest --output-on-failure -C ${{ matrix.ci.build_type }}
+ working-directory: build
+ run: ctest --output-on-failure -C ${{ matrix.ci.build_type }}
macos:
name: 'macOS clang'
@@ -417,8 +435,7 @@ jobs:
steps:
- name: 'Setup'
- run: |
- brew install ccache
+ run: brew install ccache
- name: 'Install'
env:
@@ -442,19 +459,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 4
+ -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
+ ccache --show-stats
- name: Save build cache
uses: actions/cache/save at v4
@@ -463,9 +479,8 @@ jobs:
key: ${{ steps.restore-cache.outputs.cache-primary-key }}
- name: 'Test'
- run: |
- cd build
- ctest -V --output-on-failure -C ${BUILD_TYPE}
+ working-directory: ./build
+ run: ctest -V --output-on-failure -C ${{ matrix.build_type }}
code-quality:
@@ -482,8 +497,7 @@ jobs:
uses: actions/checkout at v4
- name: 'cppcheck'
- run: |
- ./tools/cppcheck.sh
+ run: ./tools/cppcheck.sh
cmake-subproject:
@@ -495,6 +509,7 @@ jobs:
set -e
uname -a
sudo -E apt-get update
+ sudo -E apt-get autopurge -y needrestart
sudo -E apt-get -yq --no-install-suggests --no-install-recommends install make python3-pip g++
python3 -m pip install --disable-pip-version-check --user cmake==3.13.*
echo "$(python3 -m site --user-base)/bin" >> $GITHUB_PATH
commit fb3c0202f849c66d9e2d33fdc1c71adf60989a9b
Author: Dan Baston <dbaston at gmail.com>
Date: Thu Jun 20 12:59:28 2024 -0400
CI: Update MacOS runners (#1117)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bc60d501e..63fc69864 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -398,17 +398,17 @@ jobs:
strategy:
fail-fast: false
matrix:
- xcode: [11.7, 12.4, 13.2.1]
+ xcode: [13.2.1]
cxxstd: [14]
build_type: ['ASAN']
- runs_on: ['macos-11']
+ runs_on: ['macos-12']
include:
- - xcode: 13.2.1
+ - xcode: 14.3.1
cxxstd: 17
build_type: Debug
- runs_on: macos-11
+ runs_on: macos-13
# arm64 build
- - xcode: 14.3
+ - xcode: 15.4
cxxstd: 20
build_type: Release
runs_on: macOS-14
commit ac1d92432ea887a06864fd66283546724ca8caa1
Author: Dan Baston <dbaston at gmail.com>
Date: Thu Jun 20 12:59:17 2024 -0400
CI: Disable fail-fast (#1116)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 35a0f7a2d..bc60d501e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,7 @@ jobs:
linux:
name: 'Linux'
strategy:
+ fail-fast: false
matrix:
ci:
- cxx_compiler: g++
@@ -298,6 +299,7 @@ jobs:
run:
shell: msys2 {0}
strategy:
+ fail-fast: false
matrix:
build_type: ['Debug', 'Release']
@@ -345,6 +347,7 @@ jobs:
windows-msvc:
name: 'Windows (Visual Studio)'
strategy:
+ fail-fast: false
matrix:
ci:
- build_type: Debug
@@ -393,6 +396,7 @@ jobs:
macos:
name: 'macOS clang'
strategy:
+ fail-fast: false
matrix:
xcode: [11.7, 12.4, 13.2.1]
cxxstd: [14]
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/ci.yml | 139 +++++++++++++++++++++++++++--------------------
1 file changed, 79 insertions(+), 60 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list