Author: brane
Date: Fri Jun 6 22:18:44 2025
New Revision: 1926197
URL: http://svn.apache.org/viewvc?rev=1926197&view=rev
Log:
Follow up to r1926194.
* .github/workflows/windows-cmake.yml: Try another syntax for accessing
environment variables.
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=1926197&r1=1926196&r2=1926197&view=diff
==============================================================================
--- serf/trunk/.github/workflows/windows-cmake.yml (original)
+++ serf/trunk/.github/workflows/windows-cmake.yml Fri Jun 6 22:18:44 2025
@@ -36,8 +36,8 @@ jobs:
- name: Set build environment for x86
run: |
- echo "SERF_WIN_PLATFORM=Win32" >> $GITHUB_ENV
- echo "SERF_WIN_ARCHITECTURE=x86" >> $GITHUB_ENV
+ echo "SERF_WIN_PLATFORM=Win32" >> %GITHUB_ENV%
+ echo "SERF_WIN_ARCHITECTURE=x86" >> %GITHUB_ENV%
if: startsWith(matrix.triplet, 'x86-')
- name: Set build environment for x64
@@ -52,7 +52,7 @@ jobs:
- uses: actions/checkout@v3
- name: Configure CMake
- run: cmake -B ${{github.workspace}}/build -G "${{ matrix.generator }}"
-A ${{env.SERF_WIN_ARCHITECTURE}}
-D-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 }}"
-A %SERF_WIN_ARCHITECTURE% -DCMAKE_GENERATOR_PLATFORM=%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 }}
