Author: brane
Date: Fri Jun 6 23:38:52 2025
New Revision: 1926202
URL: http://svn.apache.org/viewvc?rev=1926202&view=rev
Log:
* .github/workflows/windows-cmake.yml: Hoping the architecture will be
correctly deduced from the platform.
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=1926202&r1=1926201&r2=1926202&view=diff
==============================================================================
--- serf/trunk/.github/workflows/windows-cmake.yml (original)
+++ serf/trunk/.github/workflows/windows-cmake.yml Fri Jun 6 23:38:52 2025
@@ -39,7 +39,6 @@ jobs:
with:
script: |
core.exportVariable('SERF_WIN_PLATFORM', 'Win32');
- core.exportVariable('SERF_WIN_ARCHITECTURE', 'x86');
if: startsWith(matrix.triplet, 'x86-')
- name: Set build environment for x64
@@ -47,7 +46,6 @@ jobs:
with:
script: |
core.exportVariable('SERF_WIN_PLATFORM', 'x64');
- core.exportVariable('SERF_WIN_ARCHITECTURE', 'x64');
if: startsWith(matrix.triplet, 'x64-')
- name: Install dependencies
@@ -56,7 +54,7 @@ jobs:
- uses: actions/checkout@v3
- name: Configure CMake
- run: cmake -B ${{github.workspace}}/build -G "${{ matrix.generator }}"
-A ${{ env.SERF_WIN_ARCHITECTURE }} -DCMAKE_GENERATOR_PLATFORM=${{
env.SERF_WIN_PLATFORM }}
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-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 }}
+ run: cmake -B ${{github.workspace}}/build -G "${{ matrix.generator }}"
-DCMAKE_GENERATOR_PLATFORM=${{ env.SERF_WIN_PLATFORM }}
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-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
run: cmake --build ${{github.workspace}}/build --config ${{
matrix.build-type }}
