From 5e4c68e1a2b804715dc8cc11346bfe04fdcbea1d Mon Sep 17 00:00:00 2001 From: laggykiller Date: Wed, 28 Feb 2024 11:16:40 +0800 Subject: [PATCH] Force regen conan profile; Build with newer macos runner --- .github/workflows/pythonpackage.yml | 6 +++--- setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index ce88c62..281b565 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -117,15 +117,15 @@ jobs: cibw_archs: ARM64 cibw_build: "cp*" compile_target: armv8 - - os: macos-11 + - os: macos-12 cibw_archs: x86_64 cibw_build: "cp*" compile_target: x86_64 - - os: macos-11 + - os: macos-14 cibw_archs: arm64 cibw_build: "cp*" compile_target: armv8 - - os: macos-11 + - os: macos-14 cibw_archs: universal2 cibw_build: "cp*" compile_target: universal2 diff --git a/setup.py b/setup.py index a47bf3c..3323c7f 100644 --- a/setup.py +++ b/setup.py @@ -76,7 +76,7 @@ def install_openssl(arch: str) -> dict: # Need to compile openssl if musllinux build.append("openssl*") - subprocess.run(["conan", "profile", "detect"]) + subprocess.run(["conan", "profile", "detect", "-f"]) conan_output = os.path.join("conan_output", arch)