build: 📦 update cibuildwheel configuration and corrected build_wheels.sh

darvid · Jan 24, 2024 · a99d208 · a99d208
1 parent a9f1ec4
commit a99d208
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -14,6 +14,8 @@ jobs:
     name: ${{ matrix.python_id }}-${{ matrix.platform_id }} wheel
     runs-on: ${{ matrix.os }}
     if: github.repository == 'darvid/python-hyperscan'
+    env:
+      PCRE_VERSION: "8.45"
 
     strategy:
       fail-fast: false
@@ -156,6 +158,7 @@ jobs:
       - name: Build and test wheels
         if: steps.cache-dist.outputs.cache-hit != 'true'
         env:
+          PCRE_VERSION: "${{env.PCRE_VERSION}}"
           CIBW_BUILD: ${{ matrix.python_id }}-${{ matrix.platform_id }}
           CIBW_BUILD_VERBOSITY: 1
         run: bash ./build_tools/wheels/build_wheels.sh

diff --git a/build_tools/macos/build_hyperscan.sh b/build_tools/macos/build_hyperscan.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euxo pipefail
 
-HYPERSCAN_GIT_SOURCE=https://github.com/VectorCamp/vectorscan
+HYPERSCAN_GIT_SOURCE=${HYPERSCAN_GIT_SOURCE:-https://github.com/VectorCamp/vectorscan}
 HYPERSCAN_GIT_REF=${HYPERSCAN_GIT_REF:-vectorscan/5.4.11}
 HYPERSCAN_BUILD_TYPE=${HYPERSCAN_BUILD_TYPE:-MinSizeRel}
 PCRE_VERSION=${PCRE_VERSION:-8.45}

diff --git a/build_tools/wheels/build_wheels.sh b/build_tools/wheels/build_wheels.sh
@@ -1,11 +1,6 @@
 #!/bin/bash
 set -euxo pipefail
 
-# Only applicable to macOS builds
-export HYPERSCAN_VERSION=${HYPERSCAN_VERSION:-v5.4.2}
-export HYPERSCAN_BUILD_TYPE=${HYPERSCAN_BUILD_TYPE:-Release}
-export PCRE_VERSION="${PCRE_VERSION:-8.45}"
-
 if [[ $(uname) == "Darwin" ]]; then
   export MACOSX_DEPLOYMENT_TARGET="10.14"
   export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-/usr/local/lib}"

diff --git a/pyproject.toml b/pyproject.toml
@@ -38,9 +38,9 @@ before-test = "bash {project}/build_tools/wheels/before_test.sh"
 # Will avoid testing on emulated architectures and macOS Apple silicon
 test-skip = "*-*linux_{aarch64,ppc64le,s390x} *-macosx_arm64"
 
-manylinux-x86_64-image = "ghcr.io/darvid/python_hyperscan_manylinux_2_28_x86_64:2023-11-18-5d811a1"
-manylinux-pypy_x86_64-image = "ghcr.io/darvid/python_hyperscan_manylinux_2_28_x86_64:2023-11-18-5d811a1"
-musllinux-x86_64-image = "ghcr.io/darvid/python_hyperscan_musllinux_1_1_x86_64:2023-11-18-5d811a1"
+manylinux-x86_64-image = "ghcr.io/darvid/python_hyperscan_manylinux_2_28_x86_64:2024-01-08-5c754d0"
+manylinux-pypy_x86_64-image = "ghcr.io/darvid/python_hyperscan_manylinux_2_28_x86_64:2024-01-08-5c754d0"
+musllinux-x86_64-image = "ghcr.io/darvid/python_hyperscan_musllinux_1_1_x86_64:2024-01-08-5c754d0"
 
 # repair-wheel-command = [
 #   'pip install auditwheel-symbols',