From 0d44ea22cebf54976cf4e49aee9716d3f89c4289 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 19 Dec 2024 10:47:24 -0500 Subject: [PATCH 1/3] Run on PR --- .github/workflows/build-binaries.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 8fadf13a..c01e10d3 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -4,6 +4,7 @@ on: branches: - main - "releases/*" + pull_request: jobs: # Compile the binaries and upload artifacts From e46acdcd9e8ebb8f429ad6f1ffe6ab4fb06846c2 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 19 Dec 2024 10:50:01 -0500 Subject: [PATCH 2/3] Fix wheel building --- .github/workflows/build-binaries.yml | 2 +- pyproject.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index c01e10d3..df5b48fc 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -20,7 +20,7 @@ jobs: runsOn: ubuntu-24.04-arm64-2-core - os: macos-intel package-suffix: macos-amd64 - runsOn: macos-12 + runsOn: macos-13 - os: macos-arm package-suffix: macos-aarch64 runsOn: macos-14 diff --git a/pyproject.toml b/pyproject.toml index d394bbaf..bb3384a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -119,6 +119,7 @@ filterwarnings = [ ] [tool.cibuildwheel] +before-all = "pip install protoc-wheel-0" # We only want the 3.8 64-bit build of each type. However, due to # https://github.com/pypa/cibuildwheel/issues/1278, we have to build macOS as # 3.9 until that is fixed. Our fix-wheel process will rename it to 3.8 and we @@ -128,6 +129,7 @@ build-verbosity = "1" [tool.cibuildwheel.linux] before-all = "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y && yum install -y openssl-devel" +before-build = "pip install protoc-wheel-0" environment = { PATH = "$PATH:$HOME/.cargo/bin", CARGO_NET_GIT_FETCH_WITH_CLI = "true" } [tool.mypy] From 7eb5e9b4eea3082f31b9d42dd15b32a83515e124 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 19 Dec 2024 11:37:58 -0500 Subject: [PATCH 3/3] Fix cibuildwheel for macos --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index bb3384a0..e12bbeae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -132,6 +132,9 @@ before-all = "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stab before-build = "pip install protoc-wheel-0" environment = { PATH = "$PATH:$HOME/.cargo/bin", CARGO_NET_GIT_FETCH_WITH_CLI = "true" } +[tool.cibuildwheel.macos] +environment = { MACOSX_DEPLOYMENT_TARGET = "10.12" } + [tool.mypy] ignore_missing_imports = true exclude = [