From 84203419ce443027106937bf17a3c9eaf3bcd1c5 Mon Sep 17 00:00:00 2001
From: Marc Glisse <marc.glisse@inria.fr>
Date: Sun, 11 Dec 2022 16:08:53 +0100
Subject: Build universal2 wheels on macos

Use 10.15 or old python complains
More robust location for pip package
---
 .github/workflows/pip-build-osx.yml     | 12 ++++++++++++
 .github/workflows/pip-packaging-osx.yml | 17 ++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/pip-build-osx.yml b/.github/workflows/pip-build-osx.yml
index 59e94ca5..dbd15e2c 100644
--- a/.github/workflows/pip-build-osx.yml
+++ b/.github/workflows/pip-build-osx.yml
@@ -2,6 +2,11 @@ name: pip build osx
 
 on: [push, pull_request]
 
+env:
+  MACOSX_DEPLOYMENT_TARGET: 10.14
+  _PYTHON_HOST_PLATFORM: macosx-10.14-universal2
+  ARCHFLAGS: "-arch arm64 -arch x86_64"
+
 jobs:
   build:
     runs-on: macos-latest
@@ -24,14 +29,21 @@ jobs:
           brew install boost eigen gmp mpfr cgal || true
           python -m pip install --user -r ext/gudhi-deploy/build-requirements.txt
           python -m pip install --user twine delocate
+          ./scripts/build_osx_universal_gmpfr.sh
+          # Now the universal libraries are in $PWD/deps-uni/lib
       - name: Build python wheel
         run: |
+          export   GMP_LIB_DIR=$PWD/deps-uni/lib
+          export GMPXX_LIB_DIR=$PWD/deps-uni/lib
+          export  MPFR_LIB_DIR=$PWD/deps-uni/lib
           python --version
           mkdir build
           cd build
           cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 ..
           cd src/python
           python setup.py bdist_wheel
+          export PATH="$PATH:`python -m site --user-base`/bin"
+          delocate-wheel --require-archs universal2 -v dist/*.whl
       - name: Install and test python wheel
         run: |
           python -m pip install --user pytest build/src/python/dist/*.whl
diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml
index 3ae840c6..851949fc 100644
--- a/.github/workflows/pip-packaging-osx.yml
+++ b/.github/workflows/pip-packaging-osx.yml
@@ -4,6 +4,11 @@ on:
   release:
     types: [published]
 
+env:
+  MACOSX_DEPLOYMENT_TARGET: 10.15
+  _PYTHON_HOST_PLATFORM: macosx-10.15-universal2
+  ARCHFLAGS: "-arch arm64 -arch x86_64"
+
 jobs:
   build:
     runs-on: macos-latest
@@ -26,8 +31,13 @@ jobs:
           brew install boost eigen gmp mpfr cgal || true
           python -m pip install --user -r ext/gudhi-deploy/build-requirements.txt
           python -m pip install --user twine delocate
+          ./scripts/build_osx_universal_gmpfr.sh
+          # Now the universal libs are in $PWD/deps-uni/lib
       - name: Build python wheel
         run: |
+          export   GMP_LIB_DIR=$PWD/deps-uni/lib
+          export GMPXX_LIB_DIR=$PWD/deps-uni/lib
+          export  MPFR_LIB_DIR=$PWD/deps-uni/lib
           python --version
           mkdir build
           cd build
@@ -45,6 +55,7 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
           mkdir wheelhouse
-          /Users/runner/.local/bin/delocate-listdeps build/src/python/dist/*
-          /Users/runner/.local/bin/delocate-wheel --require-archs x86_64 -w wheelhouse build/src/python/dist/*
-          python -m twine upload wheelhouse/*
\ No newline at end of file
+          export PATH="$PATH:`python -m site --user-base`/bin"
+          delocate-listdeps build/src/python/dist/*
+          delocate-wheel --require-archs universal2 -w wheelhouse build/src/python/dist/*
+          python -m twine upload wheelhouse/*
-- 
cgit v1.2.3