Add new github action that should build the wheel for both archs

Author: urban233

.github/workflows/build_wheel.yaml

@@ -12,44 +12,127 @@
 #-*
 #-*
 #Z* -------------------------------------------------------------------
+#name: Build Wheel
+#
+#on: [push]
+#
+#jobs:
+#  build:
+#
+#    runs-on: macos-latest
+#    strategy:
+#      matrix:
+#        python-version: ["3.10", "3.11", "3.12"]
+#
+#    steps:
+#      - uses: actions/checkout@v4
+#      - name: Set up Python ${{ matrix.python-version }}
+#        uses: actions/setup-python@v5
+#        with:
+#          python-version: ${{ matrix.python-version }}
+#      # You can test your matrix by printing the current Python version
+#      - name: Display Python version
+#        run: python -c "import sys; print(sys.version)"
+#
+#      - name: Install dependencies
+#        run: |
+#          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+#          brew install cmake
+#          python -m venv .venv
+#          ./.venv/bin/pip install wheel setuptools
+#          ./.venv/bin/pip install -r requirements.txt
+#          ./automator.sh setup dev-env
+#
+#      - name: Build wheel
+#        run: |
+#          ./automator.sh build so
+#          ./automator.sh build wheel
+#
+#      - name: Upload artifact
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: wheel-${{ matrix.python-version }}
+#          path: dist/*.whl
+
+
 name: Build Wheel
 
 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:
-        python-version: ["3.10", "3.11", "3.12"]
-
+        arch: [x86_64, arm64]
+        python-version: ["3.11", "3.12"]
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Checkout repository
+        uses: actions/checkout@v3
         with:
-          python-version: ${{ matrix.python-version }}
-      # You can test your matrix by printing the current Python version
-      - name: Display Python version
-        run: python -c "import sys; print(sys.version)"
+          submodules: recursive
 
-      - name: Install dependencies
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VER }}
+
+      - name: Create virtual environment
         run: |
-          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-          brew install cmake
           python -m venv .venv
-          ./.venv/bin/pip install wheel setuptools
-          ./.venv/bin/pip install -r requirements.txt
-          ./automator.sh setup dev-env
+          source .venv/bin/activate
+          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: Build wheel
+      - name: Bootstrap vcpkg
+        run: ${{ env.VCPKG_ROOT }}/bootstrap-vcpkg.sh -disableMetrics
+
+      - name: Install vcpkg dependencies
         run: |
-          ./automator.sh build so
-          ./automator.sh build wheel
+          TRIPLET=$([ "${{ matrix.arch }}" = "arm64" ] && echo "arm64-osx" || echo "x64-osx")
+          ${{ env.VCPKG_ROOT }}/vcpkg install
 
+      - name: Build extension
+        env:
+          CMAKE_ARGS: >
+            -DCMAKE_TOOLCHAIN_FILE=./vendor/vcpkg/scripts/buildsystems/vcpkg.cmake
+            -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}
+            -DPYTHON_VER=${{ env.PYTHON_VER }}
+            -DSHARED_SUFFIX=.cpython-311-darwin.so  # Update to match Python version
+        run: |
+          source .venv/bin/activate
+          python setup.py build bdist_wheel
+#      - name: Create universal binary
+#        if: matrix.arch == 'x86_64'  # Run once after both arch builds
+#        run: |
+#          lipo -create \
+#            -output dist/_cmd_universal.so \
+#            build/lib*/_cmd*.so
+#          rm build/lib*/_cmd*.so  # Clean individual arch builds
+#          mv dist/_cmd_universal.so build/lib/
+#
+#      - name: Package wheel
+#        if: matrix.arch == 'x86_64'
+#        run: |
+#          source .venv/bin/activate
+#          python setup.py bdist_wheel
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: wheel-${{ matrix.python-version }}
+          name: pymol-wheel
           path: dist/*.whl