Merge pull request #264 from lrineau/macos-14-M1

add Apple M1 to the matrix
CGAL · Mar 28, 2024 · b311d4d · b311d4d
2 parents 705904f + 5e822f8
commit b311d4d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/.github/workflows/matrix.json b/.github/workflows/matrix.json
@@ -1,5 +1,30 @@
 {
-    "cgal_branch": ["v5.6.1", "5.6.x-branch", "master"],
-    "python-version": ["3.8", "3.9", "3.10", "3.11", "3.12"],
-    "os": ["ubuntu-latest", "macos-latest", "windows-latest"]
-}
+    "cgal_branch": [
+        "v5.6.1",
+        "5.6.x-branch",
+        "master"
+    ],
+    "python-version": [
+        "3.8",
+        "3.9",
+        "3.10",
+        "3.11",
+        "3.12"
+    ],
+    "os": [
+        "ubuntu-latest",
+        "macos-latest",
+        "macos-14",
+        "windows-latest"
+    ],
+    "exclude": [
+        {
+            "os": "macos-14",
+            "python-version": "3.8"
+        },
+        {
+            "os": "macos-14",
+            "python-version": "3.9"
+        }
+    ]
+}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -170,11 +170,15 @@ jobs:
               ;;
             macOS)
               LDFLAGS="-rpath ${CONDA_ENV_DIR}/lib -rpath $HOME/.local/lib"
+              DYLD_LIBRARY_PATH=${CONDA_ENV_DIR}/lib:/Users/runner/.local/lib
               export LDFLAGS
+              export DYLD_LIBRARY_PATH
               CXXFLAGS=-faligned-allocation
               export CXXFLAGS
               CGAL_DIR=$HOME/.local python -m pip wheel -v .
+              delocate-listdeps --all cgal-*.whl
               delocate-wheel -w fixed_wheel cgal-*.whl
+              delocate-listdeps --all fixed_wheel/*.whl
               rm cgal-*.whl
               cp fixed_wheel/*.whl .
               ;;

diff --git a/.integration/conda-env-test.yml b/.integration/conda-env-test.yml
@@ -4,7 +4,6 @@ channels:
   - defaults
 dependencies:
   - boost-cpp>=1.77.0
-  - mpir
   - zlib
   - eigen
   - mpfr