Skip to content

Commit eb75a2a

Browse files
committed
fix(ci): unify PKG_CONFIG_PATH setup on macOS
Move PKG_CONFIG_PATH composition into env.sh and source it in CI to ensure consistent environment between local and CI builds. This avoids potential mismatches and missing dependencies, especially for sqlite, and simplifies maintenance.
1 parent 54812fa commit eb75a2a

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ jobs:
5454
if: matrix.os == 'macos-latest'
5555
run: |
5656
node .github/ci.js
57-
prefix=$(brew --prefix)
58-
echo "PKG_CONFIG_PATH=${prefix}/opt/sqlite/lib/pkgconfig:${prefix}/opt/libpq/lib/pkgconfig:${prefix}/opt/mysql-client/lib/pkgconfig" >> ${GITHUB_ENV}
57+
source env.sh
58+
echo "PKG_CONFIG_PATH=${PKG_CONFIG_PATH}" >> ${GITHUB_ENV}
5959
- name: Run examples(Unix)
6060
run: |
6161
pkg-config --libs --cflags libpq mysqlclient

env.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ if ! brew list mysql-client &>/dev/null; then
1919
fi
2020

2121
PREFIX=$(brew --prefix)
22-
export PKG_CONFIG_PATH="${PREFIX}/opt/libpq/lib/pkgconfig:${PREFIX}/opt/mysql-client/lib/pkgconfig"
22+
# Note: sqlite is usually preinstalled on macOS, but brew version might be needed for headers.
23+
# We include it here to match the CI environment requirements.
24+
export PKG_CONFIG_PATH="${PREFIX}/opt/sqlite/lib/pkgconfig:${PREFIX}/opt/libpq/lib/pkgconfig:${PREFIX}/opt/mysql-client/lib/pkgconfig"

0 commit comments

Comments
 (0)