svn commit: r1926799 - /subversion/trunk/.github/workflows/cmake.yml

Author: jun66j5
Date: Sat Jun 28 10:57:58 2025
New Revision: 1926799

URL: http://svn.apache.org/viewvc?rev=1926799&view=rev
Log:
GitHub Actions: follow-up to r1926599, fix missing pkgconfig directory of
sqlite package in PKG_CONFIG_PATH environment variable.

* .github/workflows/cmake.yml
  (Install dependencies (Mac OS, homebrew)):
  Add pkgconfig directory of sqlite package to PKG_CONFIG_PATH.

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

Modified: subversion/trunk/.github/workflows/cmake.yml
URL: http://svn.apache.org/viewvc/subversion/trunk/.github/workflows/cmake.yml?rev=1926799&r1=1926798&r2=1926799&view=diff
==============================================================================
--- subversion/trunk/.github/workflows/cmake.yml (original)
+++ subversion/trunk/.github/workflows/cmake.yml Sat Jun 28 10:57:58 2025
@@ -149,11 +149,15 @@ jobs:
         # since there is no separate package.
         run: |
           brew install apr apr-util expat sqlite ninja subversion
-          ls -r /opt/homebrew/opt/subversion/libexec/serf
-          $PKG_CONFIG_PATH = "/opt/homebrew/opt/apr/lib/pkgconfig"
-          $PKG_CONFIG_PATH += ":/opt/homebrew/opt/apr-util/lib/pkgconfig"
-          $PKG_CONFIG_PATH += ":/opt/homebrew/opt/expat/lib/pkgconfig"
-          $PKG_CONFIG_PATH += ":/opt/homebrew/opt/subversion/libexec/serf/lib/pkgconfig"
+          $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 ":"
           "PKG_CONFIG_PATH=$PKG_CONFIG_PATH"  >> $env:GITHUB_ENV
 
       - name: Use LF for Git checkout