[geos-commits] [SCM] GEOS branch main updated. 7791300797a36a326b27d7eb031ac4a600b90a07

[git at osgeo.org]

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  7791300797a36a326b27d7eb031ac4a600b90a07 (commit)
      from  b17470d44d875fe23ba682ebe7d63602911eb2c5 (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 7791300797a36a326b27d7eb031ac4a600b90a07
Author: Mike Taves <mwtoews at gmail.com>
Date:   Sat Jul 27 21:11:14 2024 +1200

    CI: re-add MSBuild as a separate job, use matrix for ninja builds (#1130)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73760cccc..1f3771583 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -350,57 +350,88 @@ jobs:
       working-directory: ./build
       run: ctest --output-on-failure
 
-  windows-msvc:
-    name: 'Windows (Visual Studio)'
-    strategy:
-      fail-fast: false
-      matrix:
-        ci:
-          - 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 }}
+  windows-msvc-msbuild:
+    name: Windows (MSVC MSBuild)
+    runs-on: windows-2022
     steps:
     - name: 'Check Out'
       uses: actions/checkout at v4
 
-    - name: 'Setup'
-      run: choco install ccache ninja
+    # 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" ^
+          -D CMAKE_BUILD_TYPE=Debug ^
+          -D CMAKE_CXX_STANDARD=17 ^
+          -D BUILD_SHARED_LIBS=ON ^
+          ..
+        IF %ERRORLEVEL% NEQ 0 exit /B 1
+        cmake --build . --config Debug -j 4 -- /p:CL_MPcount=4
+
+    - name: 'Test'
+      working-directory: build
+      run: ctest --output-on-failure -C Debug
+
+  windows-msvc-ninja:
+    name: Windows (MSVC Ninja)
+    strategy:
+      fail-fast: false
+      matrix:
+        ci:
+        - os: windows-2019
+          cxxstd: 14
+          arch: x86
+
+        - os: windows-2022
+          cxxstd: 20
+          arch: x64
+
+    runs-on: ${{ matrix.ci.os }}
+    steps:
+
+    - name: 'Check Out'
+      uses: actions/checkout at v4
 
     - name: Retrieve build cache
       id: restore-cache
       uses: actions/cache/restore at v4
       with:
         path: .ccache
-        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}}
+        key: msvc-ninja-${{ matrix.ci.os }}-${{ matrix.ci.cxxstd }}-${{ matrix.ci.arch }}-${{ github.ref_name }}-${{ github.run_id }}
+        restore-keys: msvc-ninja-${{ matrix.ci.os }}-${{ matrix.ci.cxxstd }}-${{ matrix.ci.arch }}
+
+    - name: 'Setup'
+      run: choco install ccache ninja
+
+    - name: Activate MSVC
+      uses: ilammy/msvc-dev-cmd at v1
+      with:
+        arch: ${{ matrix.ci.arch }}
 
     - name: 'Build'
       env:
         CCACHE_DIR: ${{ github.workspace }}\.ccache
       shell: cmd
       run: |
-        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_BUILD_TYPE=Release ^
           -D CMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} ^
           -D BUILD_SHARED_LIBS=ON ^
           -D USE_CCACHE=ON ^
           ..
-        IF %ERRORLEVEL% NEQ 0 exit
-        cmake --build . --config ${{ matrix.ci.build_type }} -j 4
-        IF %ERRORLEVEL% NEQ 0 exit
+        IF %ERRORLEVEL% NEQ 0 exit /B 1
+        cmake --build . --config Release -j 4
+        IF %ERRORLEVEL% NEQ 0 exit /B 1
         ccache --show-stats --verbose
 
     - name: Save build cache
@@ -411,7 +442,7 @@ jobs:
 
     - name: 'Test'
       working-directory: build
-      run: ctest --output-on-failure -C ${{ matrix.ci.build_type }}
+      run: ctest --output-on-failure -C Release
 
   macos:
     name: 'macOS clang'

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

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


hooks/post-receive
-- 
GEOS