improvements from wisdem

WISDEM · May 22, 2024 · 5a741e5 · 5a741e5
1 parent 651f501
commit 5a741e5
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 7 deletions.
diff --git a/.github/workflows/Publish_pyFrame3DD.yml b/.github/workflows/Publish_pyFrame3DD.yml
@@ -12,9 +12,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        os: [ubuntu-latest, windows-latest, macos-12, macos-13, macos-14]
 
     steps:
+      - name: Set up QEMU
+        if: runner.os == 'Linux'
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
+
       - name: Install compiler
         if: false == contains( matrix.os, 'windows')
         id: install_cc
@@ -33,16 +39,40 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Build wheels mac and linux
-        if: false == contains( matrix.os, 'windows')
-        uses: pypa/cibuildwheel@v2.17.0
+      - name: Build wheels linux
+        if: contains( matrix.os, 'ubuntu')
+        uses: pypa/cibuildwheel@v2.18.1
+        env:
+          CC: ${{ steps.install_cc.outputs.cc }}
+          CXX: ${{ steps.install_cc.outputs.cxx }}
+
+      - name: Build wheels mac-12
+        if: contains( matrix.os, 'macos-12')
+        uses: pypa/cibuildwheel@v2.18.1
+        env:
+          CC: ${{ steps.install_cc.outputs.cc }}
+          CXX: ${{ steps.install_cc.outputs.cxx }}
+          CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET="12.0"
+
+      - name: Build wheels mac-13
+        if: contains( matrix.os, 'macos-13')
+        uses: pypa/cibuildwheel@v2.18.1
+        env:
+          CC: ${{ steps.install_cc.outputs.cc }}
+          CXX: ${{ steps.install_cc.outputs.cxx }}
+          CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET="13.0"
+
+      - name: Build wheels mac-14
+        if: contains( matrix.os, 'macos-14')
+        uses: pypa/cibuildwheel@v2.18.1
         env:
           CC: ${{ steps.install_cc.outputs.cc }}
           CXX: ${{ steps.install_cc.outputs.cxx }}
+          CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET="14.0"
 
       - name: Build wheels windows
         if: contains( matrix.os, 'windows')
-        uses: pypa/cibuildwheel@v2.17.0
+        uses: pypa/cibuildwheel@v2.18.1
 
       - uses: actions/upload-artifact@v4
         with:

diff --git a/pyproject.toml b/pyproject.toml
@@ -117,8 +117,8 @@ atomic = true
 
 [tool.cibuildwheel]
 skip = ["pp*", "cp36-*", "cp37-*", "cp38-*", "*-win32", "*-win_arm64"] #, "*-musllinux*"]
-build-frontend = { name = "build", args = ["-w","-n","-x"] }
-before-build = "pip install numpy ninja meson meson-python"
+build-frontend = { name = "build", args = ["-w","-n"] }
+before-build = "pip install numpy ninja meson meson-python setuptools wheel"
 build-verbosity = "3"
 
 # https://github.com/pdfo/pdfo
@@ -128,3 +128,7 @@ environment = { PKG_CONFIG_PATH="c:/opt/64/lib/pkgconfig" }
 
 [tool.cibuildwheel.windows]
 repair-wheel-command = "bash .github/tools/cibw_repair_wheel_command_windows.sh {wheel} {dest_dir}"
+
+# On an Linux Intel runner with qemu installed, build Intel and ARM wheels (aarch64) for Docker.  Ignoring: ppc64le s390x
+[tool.cibuildwheel.linux]
+archs = ["auto", "aarch64"]