ECC-1793: develop binary wheel - macos multi-arch

ecmwf · Apr 17, 2024 · 60cacc3 · 60cacc3
1 parent 7d16af3
commit 60cacc3
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/.github/workflows/build-wheel-macos-arm.yml b/.github/workflows/build-wheel-macos-arm.yml
@@ -40,8 +40,8 @@ jobs:
 
     strategy:
       matrix:
-        arch: [ARM64, X64]
-    runs-on: [self-hosted, macOS, ${{ matrix.arch }}]
+        arch_type: [ARM64, X64]
+    runs-on: [self-hosted, macOS, ${{ matrix.arch_type }}]
 
     name: Build
 
@@ -57,27 +57,27 @@ jobs:
     - run: ./scripts/wheel-macos.sh "3.9"
     - run: ls -l wheelhouse
     - uses: actions/upload-artifact@v2
-      name: Upload wheel 3.9 ${{ matrix.arch }}
+      name: Upload wheel 3.9 ${{ matrix.arch_type }}
       with:
-        name: wheel-macos-${{ matrix.arch }}-3.9
+        name: wheel-macos-${{ matrix.arch_type }}-3.9
         path: wheelhouse/*.whl
     - run: rm -fr wheelhouse
 
     - run: ./scripts/wheel-macos.sh "3.10"
     - run: ls -l wheelhouse
     - uses: actions/upload-artifact@v2
-      name: Upload wheel 3.10 ${{ matrix.arch }}
+      name: Upload wheel 3.10 ${{ matrix.arch_type }}
       with:
-        name: wheel-macos-${{ matrix.arch }}-3.10
+        name: wheel-macos-${{ matrix.arch_type }}-3.10
         path: wheelhouse/*.whl
     - run: rm -fr wheelhouse
 
     - run: ./scripts/wheel-macos.sh "3.11"
     - run: ls -l wheelhouse
     - uses: actions/upload-artifact@v2
-      name: Upload wheel 3.11 ${{ matrix.arch }}
+      name: Upload wheel 3.11 ${{ matrix.arch_type }}
       with:
-        name: wheel-macos-${{ matrix.arch }}-3.11
+        name: wheel-macos-${{ matrix.arch_type }}-3.11
         path: wheelhouse/*.whl
     - run: rm -fr wheelhouse
 
@@ -88,11 +88,11 @@ jobs:
       fail-fast: true
       max-parallel: 1
       matrix:
-        arch: [ARM64, X64]
+        arch_type: [ARM64, X64]
         python-version: ["3.9", "3.10", "3.11"]
         # python-version: ["3.10"]
 
-    runs-on: [self-hosted, macOS, ${{ matrix.arch }}]
+    runs-on: [self-hosted, macOS, ${{ matrix.arch_type }}]
 
     name: Test with Python ${{ matrix.python-version }}
 
@@ -102,7 +102,7 @@ jobs:
 
     - uses: actions/download-artifact@v2
       with:
-        name: wheel-macos-${{ matrix.arch }}-${{ matrix.python-version }}
+        name: wheel-macos-${{ matrix.arch_type }}-${{ matrix.python-version }}
 
     - run: ./scripts/test-macos.sh  ${{ matrix.python-version }}
 
@@ -119,20 +119,20 @@ jobs:
       fail-fast: true
       max-parallel: 1
       matrix:
-        arch: [ARM64, X64]
+        arch_type: [ARM64, X64]
         python-version: ["3.9", "3.10", "3.11"]
         # python-version: ["3.10"]
 
-    runs-on: [self-hosted, macOS, ${{ matrix.arch }}]
+    runs-on: [self-hosted, macOS, ${{ matrix.arch_type }}]
 
     steps:
 
-      - run: mkdir artifact-${{ matrix.arch }}-${{ matrix.python-version }}
+      - run: mkdir artifact-${{ matrix.arch_type }}-${{ matrix.python-version }}
 
       - uses: actions/download-artifact@v2
         with:
-          name: wheel-macos-${{ matrix.arch }}-${{ matrix.python-version }}
-          path: artifact-${{ matrix.arch }}-${{ matrix.python-version }}
+          name: wheel-macos-${{ matrix.arch_type }}-${{ matrix.python-version }}
+          path: artifact-${{ matrix.arch_type }}-${{ matrix.python-version }}
 
       - run: |
           source ./scripts/select-python.sh ${{ matrix.python-version }}
@@ -141,7 +141,7 @@ jobs:
           python3 -m venv ${VENV_DIR}
           source ${VENV_DIR}/bin/activate
           pip3 install twine
-          ls -l artifact-${{ matrix.arch }}-${{ matrix.python-version }}/*.whl
+          ls -l artifact-${{ matrix.arch_type }}-${{ matrix.python-version }}/*.whl
           #twine upload --repository testpypi artifact-${{ matrix.python-version }}/*.whl
         env:
           TWINE_USERNAME: __token__