Test on Apple Silicon ARM64

Author: cclauss

.github/scripts/ci_build_cairo.py

@@ -96,15 +96,24 @@ def get_ld_library_path(prefix: Path) -> str:
     # <prefix>/lib/* or sometimes just <prefix>/lib
     # this function returns the path to the ld library path
 
-    # first, check if the ld library path exists at <prefix>/lib/*
-    ld_library_paths = list(prefix.glob("lib/*"))
+    # On macOS ARM64, libraries are typically installed directly to <prefix>/lib
+    # On macOS Intel, they might be in <prefix>/lib/x86_64-darwin
+    # On Linux, they might be in <prefix>/lib/x86_64-linux-gnu or similar
+
+    # First, check for architecture-specific subdirectories in <prefix>/lib/*
+    # Filter to only include directories, not files
+    ld_library_paths = [p for p in prefix.glob("lib/*") if p.is_dir()]
     if len(ld_library_paths) == 1:
         return ld_library_paths[0].absolute().as_posix()
 
-    # if the ld library path does not exist at <prefix>/lib/*,
-    # return <prefix>/lib
+    # If no single subdirectory, check if libraries exist directly in <prefix>/lib
     ld_library_path = prefix / "lib"
     if ld_library_path.exists():
+        # Check if there are actual library files here
+        lib_files = list(ld_library_path.glob("*.dylib")) + list(ld_library_path.glob("*.so*"))
+        if lib_files:
+            return ld_library_path.absolute().as_posix()
+        # If lib/ exists but has no libraries, return it anyway as fallback
         return ld_library_path.absolute().as_posix()
     return ""
 

.github/workflows/ci.yml

@@ -24,10 +24,13 @@ jobs:
       matrix:
         os: [ubuntu-22.04, macos-15-intel, windows-latest]
         python: ["3.10", "3.11", "3.12", "3.13"]
+        include:
+          - os: macos-latest
+            python: "3.13"
 
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Python ${{ matrix.python }}
         uses: actions/setup-python@v6
@@ -76,6 +79,9 @@ jobs:
           path: ${{ github.workspace }}/third_party
           key: ${{ runner.os }}-dependencies-cairo-${{ hashFiles('.github/scripts/ci_build_cairo.py') }}
 
+      - if: runner.os == 'macOS' && runner.arch == 'ARM64'
+        run: brew install lzo
+
       - name: Build and install Cairo (Linux and macOS)
         if: (runner.os == 'Linux' || runner.os == 'macOS') && steps.cache-cairo.outputs.cache-hit != 'true'
         run: python .github/scripts/ci_build_cairo.py