Skip to content

Commit cb9f9c7

Browse files
author
svn-role
committed
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) git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.15.x@1933260 13f79535-47bb-0310-9956-ffa450edef68
1 parent 570afb5 commit cb9f9c7

2 files changed

Lines changed: 6 additions & 22 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,19 +140,13 @@ jobs:
140140
141141
- name: Install dependencies (Mac OS, homebrew)
142142
if: runner.os == 'macOS'
143-
# Subversion is being installed here only to get the Serf library,
144-
# since there is no separate package.
145143
run: |
146-
brew install apr apr-util expat sqlite ninja subversion
147-
$brew_prefix = "$(& brew --prefix)"
148-
ls -r "$brew_prefix/opt/subversion/libexec/serf"
149-
$PKG_CONFIG_PATH = @(
150-
"$brew_prefix/opt/apr/lib/pkgconfig",
151-
"$brew_prefix/opt/apr-util/lib/pkgconfig",
152-
"$brew_prefix/opt/expat/lib/pkgconfig",
153-
"$brew_prefix/opt/sqlite/lib/pkgconfig",
154-
"$brew_prefix/opt/subversion/libexec/serf/lib/pkgconfig") `
155-
-Join ":"
144+
$packages = @('apr', 'apr-util', 'expat', 'sqlite', 'apache-serf')
145+
brew install ninja $packages
146+
$PKG_CONFIG_PATH = `
147+
$packages | `
148+
% { "$(& brew --prefix $_)/lib/pkgconfig" } | `
149+
Join-String -Separator ':'
156150
"PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $env:GITHUB_ENV
157151
158152
- name: Use LF for Git checkout

STATUS

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,3 @@ Veto-blocked changes:
3939

4040
Approved changes:
4141
=================
42-
43-
* r1932585
44-
GitHub Actions: Adapt to apache-serf package separated from subversion
45-
package on homebrew on Feb 19, 2026.
46-
Justification:
47-
Fix a broken build with macOS on GitHub Actions.
48-
Votes:
49-
+1: jun66j5
50-
+0: dsahlberg (looks good and only affects GHA)
51-

0 commit comments

Comments
 (0)