From e5c8a6ea10caff6719c64e25ddb465b93d145f56 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Sat, 10 Aug 2024 15:34:57 -0400 Subject: [PATCH] avoid homebrew's copy of pcre2 --- .github/workflows/build.yml | 4 ++++ Makefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 060b097..49008f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,6 +76,10 @@ jobs: with: platforms: all + - name: avoid homebrew pcre2 + if: matrix.os == 'macos-14' + run: brew unlink pcre2 + - name: Build wheels uses: pypa/cibuildwheel@v2.20.0 with: diff --git a/Makefile b/Makefile index b89da44..d0c09cf 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ SHELL := bash # Figure out what version we're building UPSTREAM_VERSION := $(shell cd uwsgi; python setup.pyuwsgi.py --version) # super fragile way of extracting `APPEND_VERSION` from workflow 🤮 -APPEND_VERSION := $(shell yq e '.jobs.build_wheels.steps[4].env.CIBW_ENVIRONMENT' .github/workflows/build.yml | cut -d' ' -f1 | cut -d= -f2) +APPEND_VERSION := $(shell yq e '.jobs.build_wheels.steps[5].env.CIBW_ENVIRONMENT' .github/workflows/build.yml | cut -d' ' -f1 | cut -d= -f2) VERSION := $(UPSTREAM_VERSION)$(APPEND_VERSION) HASH := $(shell cd uwsgi; git rev-parse HEAD)