Author: brane
Date: Sun Jun 1 13:16:59 2025
New Revision: 1926040
URL: http://svn.apache.org/viewvc?rev=1926040&view=rev
Log:
* .github/workflows/windows-cmake.yml: Install Brotli, and set the
OPENSSL_ROOT_DIR, ZLIB_ROOT and BROTLI_ROOT variables for CMake.
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=1926040&r1=1926039&r2=1926040&view=diff
==============================================================================
--- serf/trunk/.github/workflows/windows-cmake.yml (original)
+++ serf/trunk/.github/workflows/windows-cmake.yml Sun Jun 1 13:16:59 2025
@@ -23,7 +23,7 @@ jobs:
runs-on: ${{ matrix.os }}
- env:
+ env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
steps:
@@ -35,12 +35,12 @@ jobs:
core.exportVariable('ACTIONS_RUNTIME_TOKEN',
process.env.ACTIONS_RUNTIME_TOKEN || '');
- name: Install dependencies
- run: vcpkg install --triplet ${{ matrix.triplet }} apr apr-util zlib
openssl
+ run: vcpkg install --triplet ${{ matrix.triplet }} apr apr-util zlib
openssl brotli
- 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_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
-DAPRUtil_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
+ 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_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 }}