Author: svn-role
Date: Thu Apr 23 04:00:13 2026
New Revision: 1933260
Log:
Merge r1932585 from trunk:
* r1932585
GitHub Actions: Adapt to apache-serf package separated from subversion
package on homebrew on Feb 19, 2026.
Justification:
Fix a broken build with macOS on GitHub Actions.
Votes:
+1: jun66j5
+0: dsahlberg (looks good and only affects GHA)
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/.github/workflows/cmake.yml
subversion/branches/1.15.x/STATUS
Modified: subversion/branches/1.15.x/.github/workflows/cmake.yml
==============================================================================
--- subversion/branches/1.15.x/.github/workflows/cmake.yml Thu Apr 23
02:49:02 2026 (r1933259)
+++ subversion/branches/1.15.x/.github/workflows/cmake.yml Thu Apr 23
04:00:13 2026 (r1933260)
@@ -140,19 +140,13 @@ jobs:
- name: Install dependencies (Mac OS, homebrew)
if: runner.os == 'macOS'
- # Subversion is being installed here only to get the Serf library,
- # since there is no separate package.
run: |
- brew install apr apr-util expat sqlite ninja subversion
- $brew_prefix = "$(& brew --prefix)"
- ls -r "$brew_prefix/opt/subversion/libexec/serf"
- $PKG_CONFIG_PATH = @(
- "$brew_prefix/opt/apr/lib/pkgconfig",
- "$brew_prefix/opt/apr-util/lib/pkgconfig",
- "$brew_prefix/opt/expat/lib/pkgconfig",
- "$brew_prefix/opt/sqlite/lib/pkgconfig",
- "$brew_prefix/opt/subversion/libexec/serf/lib/pkgconfig") `
- -Join ":"
+ $packages = @('apr', 'apr-util', 'expat', 'sqlite', 'apache-serf')
+ brew install ninja $packages
+ $PKG_CONFIG_PATH = `
+ $packages | `
+ % { "$(& brew --prefix $_)/lib/pkgconfig" } | `
+ Join-String -Separator ':'
"PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $env:GITHUB_ENV
- name: Use LF for Git checkout
Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS Thu Apr 23 02:49:02 2026
(r1933259)
+++ subversion/branches/1.15.x/STATUS Thu Apr 23 04:00:13 2026
(r1933260)
@@ -39,13 +39,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1932585
- GitHub Actions: Adapt to apache-serf package separated from subversion
- package on homebrew on Feb 19, 2026.
- Justification:
- Fix a broken build with macOS on GitHub Actions.
- Votes:
- +1: jun66j5
- +0: dsahlberg (looks good and only affects GHA)
-
