Add intel-based macOS runner to github action Build Wheel

Author: urban233

.github/workflows/build_wheel.yaml

@@ -59,15 +59,14 @@ on: [push]
 
 env:
   VCPKG_ROOT: ${{ github.workspace }}/vendor/vcpkg  # Match your project structure
-  VCPKG_TRIPLET: x64-osx  # Use arm64-osx for Apple Silicon
 
 jobs:
   build:
-    runs-on: macos-latest
     strategy:
       matrix:
-        arch: [x86_64, arm64]
+        os: [macos-13, macos-14]
         python-version: ["3.11", "3.12"]
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -90,17 +89,6 @@ jobs:
           python -m pip install wheel  # Add other build deps if needed
           python -m pip install -r requirements.txt
 
-#      - name: Cache vcpkg
-#        uses: actions/cache@v3
-#        with:
-#          path: |
-#            ${{ env.VCPKG_ROOT }}/downloads
-#            ${{ env.VCPKG_ROOT }}/packages
-#            ${{ env.VCPKG_ROOT }}/installed
-#          key: ${{ runner.os }}-vcpkg-${{ matrix.arch }}-${{ hashFiles('vcpkg.json') }}
-#          restore-keys: |
-#            ${{ runner.os }}-vcpkg-${{ matrix.arch }}-
-
       - name: Bootstrap vcpkg
         run: ${{ env.VCPKG_ROOT }}/bootstrap-vcpkg.sh -disableMetrics
 
@@ -131,7 +119,9 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: pymol-wheel
+          name: macpymol-wheel-${{ matrix.os }}
           path: dist/*.whl
 
-# TRIPLET=$([ "${{ matrix.arch }}" = "arm64" ] && echo "arm64-osx" || echo "x64-osx")
+# VCPKG_TRIPLET: x64-osx  # Use arm64-osx for Apple Silicon
+# TRIPLET=$([ "${{ matrix.arch }}" = "arm64" ] && echo "arm64-osx" || echo "x64-osx")
+# arch: [x86_64, arm64]

automations/build_macos_wheel.py

@@ -25,20 +25,21 @@
 
 def build_wheel() -> None:
   """Builds the wheel file for the python PyMOL package."""
-  # Run the command using subprocess.run
+  tmp_python_version = f"{sys.version_info.major}.{sys.version_info.minor}"
+  tmp_shared_suffix = f".cpython-{tmp_python_version.replace('.', '')}-darwin.so"
   if not pathlib.Path(const.PROJECT_ROOT_DIR / "src/python/pymol").exists():
     utils.copy_pymol_sources()
-    _CMD_FROM_BUILD_DIR = pathlib.Path(const.PROJECT_ROOT_DIR / "cmake-build-release" / "_cmd.cpython-311-darwin.so")
-    _CMD_FROM_PRE_BUILT_DIR = pathlib.Path(const.PROJECT_ROOT_DIR / "pre-built" / "_cmd.cpython-311-darwin.so")
+    _CMD_FROM_BUILD_DIR = pathlib.Path(const.PROJECT_ROOT_DIR / "cmake-build-release" / f"_cmd{tmp_shared_suffix}")
+    _CMD_FROM_PRE_BUILT_DIR = pathlib.Path(const.PROJECT_ROOT_DIR / "pre-built" / f"_cmd{tmp_shared_suffix}")
     if _CMD_FROM_BUILD_DIR.exists():
       shutil.copy(
         _CMD_FROM_BUILD_DIR,
-        pathlib.Path(const.PROJECT_ROOT_DIR / "src/python/pymol" / "_cmd.cpython-311-darwin.so")
+        pathlib.Path(const.PROJECT_ROOT_DIR / "src/python/pymol" / f"_cmd{tmp_shared_suffix}")
       )
     else:
       shutil.copy(
         _CMD_FROM_PRE_BUILT_DIR,
-        pathlib.Path(const.PROJECT_ROOT_DIR / "src/python/pymol" / "_cmd.cpython-311-darwin.so")
+        pathlib.Path(const.PROJECT_ROOT_DIR / "src/python/pymol" / f"_cmd{tmp_shared_suffix}")
       )
   else:
     print("The src/python/pymol directory already exists, that might mean a self compiled _cmd module was built.")

setup.py

@@ -72,7 +72,7 @@ def build_cmake_extension(self):
       "-DCMAKE_TOOLCHAIN_FILE=./vendor/vcpkg/scripts/buildsystems/vcpkg.cmake",
       f"-DPYTHON_VER={tmp_python_version}",
       f"-DSHARED_SUFFIX={tmp_cmd_suffix}",
-      "-DCMAKE_OSX_ARCHITECTURES=arm64"
+      f"-DCMAKE_OSX_ARCHITECTURES={get_mac_architecture()}"
     ]
 
     # Run CMake to configure and build the extension