From 48a9f42ed4edd6b99ac41a23b0acb55b3c66fb9a Mon Sep 17 00:00:00 2001
From: Roberto Rossini <71787608+robomics@users.noreply.github.com>
Date: Sat, 29 Jul 2023 15:35:13 +0200
Subject: [PATCH] Bugfix

---
 .github/workflows/wheels.yml |  4 ++++
 pyproject.toml               | 34 ++++++++++++++++++++--------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 9c5515d..f9154a9 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -84,6 +84,10 @@ jobs:
 
       - name: Upload wheels
         uses: actions/upload-artifact@v3
+        env:
+          CIBW_ARCHS_LINUX: x86_64
+          CIBW_ARCHS_MACOS: x86_64 arm64
+          CIBW_ARCHS_WINDOWS: AMD64
         with:
           path: wheelhouse/*.whl
 
diff --git a/pyproject.toml b/pyproject.toml
index 2d5b69b..b4bcff7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,27 +36,33 @@ testpaths = ["tests"]
 
 [tool.cibuildwheel]
 # Setuptools bug causes collision between pypy and cpython artifacts
-before-build = ["rm -rf {project}/build",
-"""conan install {project} \\
- -s build_type=Release \\
- -s compiler.cppstd=17 \\
- --output-folder "{project}/conan_build" \\
- -o '*/*:shared=True' \\
- --build=missing"""
+before-build = [
+  "rm -rf '{project}/build'",
+  "pip install 'conan>=2'",
+  "conan profile detect --force",
+  """
+  conan install {project} \
+  -s build_type=Release \
+  -s compiler.cppstd=17 \
+  --output-folder "$TMPDIR/conan_build" \
+  -o '*/*:shared=True' \
+  --build="missing"
+   """
 ]
-environment = """CMAKE_ARGS="-DCMAKE_PREFIX_PATH='{project}/conan_build'" """
+environment = { CMAKE_ARGS = '-DCMAKE_PREFIX_PATH="$TMPDIR/conan_build"', MACOSX_DEPLOYMENT_TARGET = '10.15' }
+environment-pass = ["CMAKE_ARGS"]
 
 [tool.ruff]
 extend-select = [
-  "B",    # flake8-bugbear
+  "B", # flake8-bugbear
   "B904",
-  "I",    # isort
-  "PGH",  # pygrep-hooks
-  "RUF",  # Ruff-specific
-  "UP",   # pyupgrade
+  "I", # isort
+  "PGH", # pygrep-hooks
+  "RUF", # Ruff-specific
+  "UP", # pyupgrade
 ]
 extend-ignore = [
-  "E501",   # Line too long
+  "E501", # Line too long
 ]
 target-version = "py36"