From: Ivan Zhakov <ivan@apache.org>
Date: Sat, 20 Jul 2024 16:44:26 +0000 (+0000)
Subject: * .github/workflows/windows.yml: Try to use Ninja for Windows CI build.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f8d9d8274bb4a56c0f3a05820b6f79c5262832a;p=thirdparty%2Fapache%2Fhttpd.git

* .github/workflows/windows.yml: Try to use Ninja for Windows CI build.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919414 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 775dada4614..386770fd5e2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -24,8 +24,9 @@ jobs:
         include:
           - name: Default
             triplet: x64-windows
+            arch: x64
             build-type: Debug
-            generator: "Visual Studio 17 2022"
+            generator: "Ninja"
 
     runs-on: windows-latest
     timeout-minutes: 30
@@ -40,17 +41,25 @@ jobs:
               core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
               core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
+      - name: Setup dev environment
+
       - name: Install dependencies
         run: vcpkg install --triplet ${{ matrix.triplet }} apr[private-headers] apr-util pcre2
 
       - uses: actions/checkout@v3
 
       - name: Configure CMake
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }}
-                -G "${{ matrix.generator }}"
-                -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-                -DAPR_INCLUDE_DIR=C:/vcpkg/installed/${{ matrix.triplet }}/include
+        shell: cmd
+        run: |
+            call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
+            cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ^
+                -G "${{ matrix.generator }}" ^
+                -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake ^ 
+                -DAPR_INCLUDE_DIR=C:/vcpkg/installed/${{ matrix.triplet }}/include ^
                 "-DAPR_LIBRARIES=C:/vcpkg/installed/${{ matrix.triplet }}/lib/libapr-1.lib;C:/vcpkg/installed/${{ matrix.triplet }}/lib/libaprutil-1.lib"
 
       - name: Build
-        run: cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }}
+        shell: cmd
+        run: |
+            call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
+            cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }}