From 310bc75532fd842cb578a44b0deee755391e9af2 Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Sun, 5 Jan 2025 02:37:42 +0100 Subject: [PATCH] ci(macos): move libpq build script to BEFORE_ALL build step This is is how it is organised in Linux. --- .github/workflows/packages.yml | 6 ------ scripts/build/wheel_macos_before_all.sh | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index ad1c69c5..7d241dd7 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -160,12 +160,6 @@ jobs: - name: Checkout repos uses: actions/checkout@v4 - - name: Build dependencies - run: ./scripts/build/build_libpq.sh - - - name: Show dependency tree - run: otool -L /tmp/libpq.build/lib/*.dylib - - name: Build wheels uses: pypa/cibuildwheel@v2.22.0 env: diff --git a/scripts/build/wheel_macos_before_all.sh b/scripts/build/wheel_macos_before_all.sh index 882b887f..e5fdd141 100755 --- a/scripts/build/wheel_macos_before_all.sh +++ b/scripts/build/wheel_macos_before_all.sh @@ -11,6 +11,12 @@ set -x dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" prjdir="$( cd "${dir}/../.." && pwd )" +# Build dependency libraries +"${prjdir}/scripts/build/build_libpq.sh" + +# Show dependency tree +# otool -L /tmp/libpq.build/lib/*.dylib + brew install gnu-sed postgresql@${PG_VERSION} brew link --overwrite postgresql@${PG_VERSION}