Merge remote-tracking branch 'origin/main' into test

CGAL · Mar 28, 2024 · 8c190c0 · 8c190c0
2 parents a232104 + b311d4d
commit 8c190c0
Show file tree

Hide file tree

Showing 2 changed files with 29 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/.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
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ channels: @@
       - defaults
     dependencies:
       - boost-cpp>=1.77.0
-      - mpir
       - zlib
       - eigen
       - mpfr
@@ Expand Down @@