Merge pull request #3 from alecjacobson/alecjacobson/split-up-builds

Alecjacobson/split up builds
libigl · Feb 3, 2023 · 8cfb43c · 8cfb43c
2 parents c3954ff + 80c67ef
commit 8cfb43c
Showing 1 changed file with 19 additions and 27 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -31,29 +31,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - runs-on: ubuntu-latest
-            cibw-arch: manylinux_x86_64
-          - runs-on: macos-latest
-            cibw-arch: macosx_x86_64
-          - runs-on: macos-latest
-            cibw-arch: macosx_arm64
-          - runs-on: windows-latest
-            cibw-arch: win_amd64
-
-    name: Build wheels ${{ matrix.cibw-arch }}
-    runs-on: ${{ matrix.runs-on }}
+        # Launch separate job for each python. The build is so much longer than
+        # machine configuration/setup, so parallel builds will be faster. More
+        # importantly, github times out after 6 hours _per job_.
+        cpversion: ["cp36", "cp37", "cp38", "cp39", "cp310", "cp311"]
+        os: [ { runs-on: ubuntu-latest, cibw-arch: manylinux_x86_64}, { runs-on: macos-latest, cibw-arch: macosx_x86_64}, { runs-on: macos-latest, cibw-arch: macosx_arm64}, { runs-on: windows-latest, cibw-arch: win_amd64} ]
+        exclude:
+          - os: { runs-on: macos-latest, cibw-arch: macosx_arm64}
+            cpversion: "cp36"
+          - os: { runs-on: macos-latest, cibw-arch: macosx_arm64}
+            cpversion: "cp37"
+
+
+
+    name: Build wheels ${{ matrix.cpversion }}-${{ matrix.os.cibw-arch }}
+    runs-on: ${{ matrix.os.runs-on }}
 
     env:
       CIBW_BUILD_VERBOSITY: 3
       # This is very dubious... It *may* work because these are just cpp libraries that should not depend on the python version. Still, super-dubious.
       CIBW_BEFORE_BUILD_WINDOWS: "python -m pip install delvewheel"
       CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "python -m delvewheel repair --no-mangle-all --add-path build\\temp.win-amd64-3.6\\Release;build\\temp.win-amd64-3.6\\Release\\Release;build\\temp.win-amd64-3.6\\Release\\_deps\\gmp-src\\lib;build\\temp.win-amd64-3.6\\Release\\_deps\\mpfr-src\\lib -w {dest_dir} {wheel} "
-      # CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "cd C: && cmd //c tree //F"
-      CIBW_SKIP: "*-win32 *_i686 pp* cp36* *musllinux*" # Skip 32-bit buildsa and PyPy, and 3.6(scipy) and *musllinux*(scipy)
       CIBW_TEST_COMMAND: "python {project}/tests/test_basic.py {project}/data/"
+      CIBW_BUILD: "${{ matrix.cpversion }}-${{ matrix.os.cibw-arch }}"
       CIBW_TEST_SKIP: "*-macosx_arm64"
       CIBW_ENVIRONMENT: "MAX_JOBS=2"
+      # Why universal2 here? It's not included above in CIBW_BUILD
+      CIBW_ARCHS_MACOS: "x86_64 arm64 universal2"
+      CIBW_ENVIRONMENT_MACOS: "CMAKE_OSX_ARCHITECTURES=\"${{ matrix.os.cibw-arch == 'macosx_x86_64' && 'x86_64' || matrix.os.cibw-arch == 'macosx_arm64' && 'arm64' || matrix.os.cibw-arch == 'macosx_universal2' && 'arm64;x86_64' || '' }}\""
 
 
     steps:
@@ -70,19 +75,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install cibuildwheel==2.12.0
-          
-      # - name: Test
-      #   run: |
-      #     python -m pip install .
-
-      - name: Configure cibuildwheel
-        shell: bash
-        run: |
-          CMAKE_ARCH="${{ matrix.cibw-arch == 'win32' && '-A Win32' || '' }}"
-          CMAKE_OSX_ARCHITECTURES=${{ matrix.cibw-arch == 'macosx_x86_64' && 'x86_64' || matrix.cibw-arch == 'macosx_arm64' && 'arm64' || matrix.cibw-arch == 'macosx_universal2' && '"arm64;x86_64"' || '' }}
-          echo "CIBW_ARCHS_MACOS=x86_64 arm64 universal2" >> $GITHUB_ENV
-          echo "CIBW_BUILD=*-${{ matrix.cibw-arch }}" >> $GITHUB_ENV
-          echo "CIBW_ENVIRONMENT_MACOS=CMAKE_OSX_ARCHITECTURES=\"$CMAKE_OSX_ARCHITECTURES\"" >> $GITHUB_ENV
 
       - name: Build wheels
         run: |