Author: brane
Date: Sun Jun 8 05:55:49 2025
New Revision: 1926242
URL: http://svn.apache.org/viewvc?rev=1926242&view=rev
Log:
* .github/workflows/windows-cmake.yml: Poorly defined YAML semantics
plus Windows PowerShell weirdness equals guaranteed madness.
Modified:
serf/trunk/.github/workflows/windows-cmake.yml
Modified: serf/trunk/.github/workflows/windows-cmake.yml
URL:
http://svn.apache.org/viewvc/serf/trunk/.github/workflows/windows-cmake.yml?rev=1926242&r1=1926241&r2=1926242&view=diff
==============================================================================
--- serf/trunk/.github/workflows/windows-cmake.yml (original)
+++ serf/trunk/.github/workflows/windows-cmake.yml Sun Jun 8 05:55:49 2025
@@ -14,13 +14,15 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: [windows-latest]
- generator: ["Visual Studio 17 2022"]
include:
- - triplet: x64-windows
+ - os: windows-latest
platform: x64
- - triplet: x86-windows
+ triplet: x64-windows
+ generator: "Visual Studio 17 2022"
+ - os: windows-latest
platform: Win32
+ triplet: x86-windows
+ generator: "Visual Studio 17 2022"
runs-on: ${{ matrix.os }}
@@ -42,16 +44,17 @@ jobs:
- name: Configure CMake
run: >
- cmake -B ${{github.workspace}}/build
- -G "${{ matrix.generator }}"
- --toolchain C:/vcpkg/scripts/buildsystems/vcpkg.cmake
- --install-prefix ${{github.workspace}}/install
- -DCMAKE_GENERATOR_PLATFORM=${{ matrix.platform }}
- -DAPR_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
- -DAPRUtil_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
- -DOPENSSL_ROOT_DIR=C:/vcpkg/installed/${{ matrix.triplet }}
- -DZLIB_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
- -DBrotli_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
+ cmake
+ -B ${{github.workspace}}/build
+ -G "${{ matrix.generator }}"
+ -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
+ -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
+ -DCMAKE_GENERATOR_PLATFORM=${{ matrix.platform }}
+ -DAPR_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
+ -DAPRUtil_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
+ -DOPENSSL_ROOT_DIR=C:/vcpkg/installed/${{ matrix.triplet }}
+ -DZLIB_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
+ -DBrotli_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
- name: Build (Release)
run: cmake --build ${{github.workspace}}/build --config Release -j
