conditionals or python version, fix architecture name

qpv-research-group · Mar 12, 2024 · c5962e9 · c5962e9
1 parent fbac892
commit c5962e9
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/.github/workflows/build_deploy_wheels.yml b/.github/workflows/build_deploy_wheels.yml
@@ -27,7 +27,7 @@ jobs:
           - [ ubuntu-latest, manylinux, x86_64]
           - [ ubuntu-latest, manylinux, i686]
           - [ macos-latest, macosx, x86_64 ] # Intel chip
-          - [ macos-14, macosx, macos-14] # ARM M1 chip
+          - [ macos-14, macosx, arm64] # ARM M1 chip
           - [ windows-2019, win, AMD64 ]
 
         python: [[ "cp38", "3.8" ], [ "cp39", "3.9" ],
@@ -54,6 +54,7 @@ jobs:
         run: python -m pip install cibuildwheel==2.17.0
 
       - name: Build Solcore
+        if: ${{ matrix.buildplat[0] != 'macos-14' }}
         uses: pypa/cibuildwheel@v2.17.0
         env:
           CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}*
@@ -62,7 +63,18 @@ jobs:
           CIBW_BEFORE_BUILD_MACOS: brew reinstall gfortran
           CIBW_BEFORE_BUILD_LINUX: python -m pip install numpy --config-settings=setup-args="-Dallow-noblas=true"
 
-#      - name: Set extra env for arm64
+      - name: Build Solcore (Apple Silicon M1/M2)
+        if: ${{ matrix.buildplat[0] == 'macos-14' && matrix.python[0] != 'cp38' && matrix.python[0] != 'cp39' }}
+        uses: pypa/cibuildwheel@v2.17.0
+        env:
+          CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}*
+          CIBW_ARCHS: ${{ matrix.buildplat[2] }}
+          CIBW_ENVIRONMENT_PASS_LINUX: RUNNER_OS
+          CIBW_BEFORE_BUILD_MACOS: brew reinstall gfortran
+          CIBW_BEFORE_BUILD_LINUX: python -m pip install numpy --config-settings=setup-args="-Dallow-noblas=true"
+
+
+      #      - name: Set extra env for arm64
 #        if: >-
 #          ( contains(matrix.buildplat[2], 'arm64' ) )
 #        run: |