Author: brane
Date: Sun Jun  8 17:21:57 2025
New Revision: 1926255

URL: http://svn.apache.org/viewvc?rev=1926255&view=rev
Log:
Update GitHub workflows.

* .github/workflows/linux.yml: Rename "Linux" to "Linux (SCons)".

* .github/workflows/windows-cmake.yml
  (step Configure CMake): Add CMAKE_PREFIX_PATH. Remove APR_ROOT,
   APRUtil_ROOT, OPENSSL_ROOT_DIR, ZLIB_ROOT and Brotli_ROOT.

Modified:
    serf/trunk/.github/workflows/linux.yml
    serf/trunk/.github/workflows/windows-cmake.yml

Modified: serf/trunk/.github/workflows/linux.yml
URL: 
http://svn.apache.org/viewvc/serf/trunk/.github/workflows/linux.yml?rev=1926255&r1=1926254&r2=1926255&view=diff
==============================================================================
--- serf/trunk/.github/workflows/linux.yml (original)
+++ serf/trunk/.github/workflows/linux.yml Sun Jun  8 17:21:57 2025
@@ -1,4 +1,4 @@
-name: Linux
+name: Linux (SCons)
 
 on:
   push:

Modified: serf/trunk/.github/workflows/windows-cmake.yml
URL: 
http://svn.apache.org/viewvc/serf/trunk/.github/workflows/windows-cmake.yml?rev=1926255&r1=1926254&r2=1926255&view=diff
==============================================================================
--- serf/trunk/.github/workflows/windows-cmake.yml (original)
+++ serf/trunk/.github/workflows/windows-cmake.yml Sun Jun  8 17:21:57 2025
@@ -49,14 +49,10 @@ jobs:
             cmake
             -B ${{github.workspace}}/build
             -G "${{ matrix.generator }}"
+            -DCMAKE_GENERATOR_PLATFORM=${{ matrix.platform }}
             -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
+            -DCMAKE_PREFIX_PATH=C:/vcpkg/installed/${{ matrix.triplet }}
             -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


Reply via email to