diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index b76b2c595..497d233d2 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -68,10 +68,12 @@ jobs: java-1.8.0-openjdk-devel \ glibc-static \ libstdc++-static + bash {project}/ci-scripts/cibw-build-before.sh CIBW_BEFORE_ALL_MACOS: | brew update brew install gperf ninja brew install SRI-CSL/sri-csl/libpoly + bash {project}/ci-scripts/cibw-build-before.sh CIBW_BEFORE_BUILD: > python3 -m pip install \ Cython \ @@ -81,7 +83,6 @@ jobs: setuptools \ toml \ wheel - bash {project}/ci-scripts/cibw-build-before.sh CIBW_ENVIRONMENT_MACOS: > DYLD_LIBRARY_PATH="$(pwd)/install/lib:$DYLD_LIBRARY_PATH" MACOSX_DEPLOYMENT_TARGET=${{ matrix.macos-target }} diff --git a/ci-scripts/cibw-build-before.sh b/ci-scripts/cibw-build-before.sh index aeaf15147..4509ca259 100755 --- a/ci-scripts/cibw-build-before.sh +++ b/ci-scripts/cibw-build-before.sh @@ -16,11 +16,16 @@ set -e -# Find the Python root directory for the current Python version -# This is important for the manylinux infrastructure, which is in -# a nonstandard location that CMake has trouble finding -PYTHON_EXECUTABLE=$(which python3) -echo "Using Python_EXECUTABLE: ${PYTHON_EXECUTABLE}" +python3 -m venv ./build-cpp-env +source ./build-cpp-env/bin/activate +python3 -m pip install \ +Cython \ +meson \ +pyparsing \ +pytest \ +setuptools \ +toml \ +wheel ./contrib/setup-bitwuzla.sh # the version of ld.gold is too old in manylinux_2_28, remove it so cvc5 falls back on bfd @@ -28,6 +33,6 @@ rm -f /usr/bin/ld.gold ./contrib/setup-cvc5.sh ./contrib/setup-z3.sh -./configure.sh --bitwuzla --cvc5 --z3 --python --python-executable=${PYTHON_EXECUTABLE} +./configure.sh --bitwuzla --cvc5 --z3 --python cd build make -j