svn commit: r1922087 - in /subversion/trunk/.github/workflows: autoconf.yml cmake.yml

[ri...@apache.org]

Author: rinrab
Date: Mon Nov 25 14:54:25 2024
New Revision: 1922087

URL: http://svn.apache.org/viewvc?rev=1922087&view=rev
Log:
GitHub Actions workflows (cmake and autoconf): Run build against Serf
library, to enable libsvn_ra_serf.

[in .github/workflows]

* autoconf.yml
  (Install dependencies): Install `libserf-dev` from Debian's apt-get.
* cmake.yml
  (Windows, static, x64, with tests): Change vcpkg_triplet from
   `x64-windows-static` to `x64-windows-static-md`, because Serf
   doesn't support static CRT.
  (Install dependencies (Windows, vcpkg)): Install `serf` port; It was
   recently introduced to vcpkg in [1] pull-request. By me!
  (Install dependencies (Linux, apt-get)): Install `libserf-dev` from
   Debian's apt-get; Same as in the `autoconf.yml` workflow.
  (Configure CMake): Enable build of `libsvn_ra_serf` library by setting
   `SVN_ENABLE_RA_SERF` option to `on`.

[1]: https://github.com/microsoft/vcpkg/pull/41043

Modified:
    subversion/trunk/.github/workflows/autoconf.yml
    subversion/trunk/.github/workflows/cmake.yml

Modified: subversion/trunk/.github/workflows/autoconf.yml
URL: http://svn.apache.org/viewvc/subversion/trunk/.github/workflows/autoconf.yml?rev=1922087&r1=1922086&r2=1922087&view=diff
==============================================================================
--- subversion/trunk/.github/workflows/autoconf.yml (original)
+++ subversion/trunk/.github/workflows/autoconf.yml Mon Nov 25 14:54:25 2024
@@ -51,6 +51,7 @@ jobs:
           libtool-bin
           libapr1-dev
           libaprutil1-dev
+          libserf-dev
           libexpat1-dev
           zlib1g-dev
           libsqlite3-dev

Modified: subversion/trunk/.github/workflows/cmake.yml
URL: http://svn.apache.org/viewvc/subversion/trunk/.github/workflows/cmake.yml?rev=1922087&r1=1922086&r2=1922087&view=diff
==============================================================================
--- subversion/trunk/.github/workflows/cmake.yml (original)
+++ subversion/trunk/.github/workflows/cmake.yml Mon Nov 25 14:54:25 2024
@@ -63,7 +63,7 @@ jobs:
             os: windows-latest
             build_shared: OFF
             cmake_generator: Ninja
-            vcpkg_triplet: x64-windows-static
+            vcpkg_triplet: x64-windows-static-md
             arch: x64
             run_tests: true
           - name: Linux, shared, with tests
@@ -116,7 +116,7 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           C:\vcpkg\vcpkg.exe install --triplet ${{ matrix.vcpkg_triplet }} `
-            apr apr-util expat zlib sqlite3
+            apr apr-util serf expat zlib sqlite3
 
           "CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" >> $env:GITHUB_ENV
 
@@ -129,6 +129,7 @@ jobs:
           libtool-bin
           libapr1-dev
           libaprutil1-dev
+          libserf-dev
           libexpat1-dev
           zlib1g-dev
           libsqlite3-dev
@@ -150,6 +151,7 @@ jobs:
           cmake -B out
           -DBUILD_SHARED_LIBS=${{ matrix.build_shared }}
           -DSVN_ENABLE_TESTS=ON
+          -DSVN_ENABLE_RA_SERF=ON
           -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/installdir
           -DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}
           ${{ matrix.extra_config_opts }}