Author: brane
Date: Fri Jun 6 23:11:54 2025
New Revision: 1926200
URL: http://svn.apache.org/viewvc?rev=1926200&view=rev
Log:
Follow up to r1926199.
* .github/workflows/windows-cmake.yml: Try still another syntax.
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=1926200&r1=1926199&r2=1926200&view=diff
==============================================================================
--- serf/trunk/.github/workflows/windows-cmake.yml (original)
+++ serf/trunk/.github/workflows/windows-cmake.yml Fri Jun 6 23:11:54 2025
@@ -35,15 +35,19 @@ jobs:
core.exportVariable('ACTIONS_RUNTIME_TOKEN',
process.env.ACTIONS_RUNTIME_TOKEN || '');
- name: Set build environment for x86
- run: |
- echo "SERF_WIN_PLATFORM=Win32" >> $env:GITHUB_ENV
- echo "SERF_WIN_ARCHITECTURE=x86" >> $env:GITHUB_ENV
+ uses: actions/github-script@v7
+ 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
- run: |
- echo "SERF_WIN_PLATFORM=x64" >> $env:GITHUB_ENV
- echo "SERF_WIN_ARCHITECTURE=x64" >> $env:GITHUB_ENV
+ uses: actions/github-script@v7
+ with:
+ script: |
+ core.exportVariable('SERF_WIN_PLATFORM', 'x64');
+ core.exportVariable('SERF_WIN_ARCHITECTURE', 'x64');
if: startsWith(matrix.triplet, 'x64-')
- name: Install dependencies
@@ -52,7 +56,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 }}"
-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 }}
- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{
matrix.build-type }}
