try different builds in workflows

aiplan4eu · Dec 17, 2024 · 56674eb · 56674eb
1 parent 952f607
commit 56674eb
Showing 1 changed file with 89 additions and 64 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,90 +3,115 @@ name: Deploy
 on: push
 
 jobs:
-  build-linux:
-    name: Build linux Python wheels
-    runs-on: ubuntu-latest
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # macos-13 is an intel runner, macos-14 is apple silicon
+        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
+      - uses: actions/checkout@v4
+
       - uses: actions/setup-python@v5
-
+      
       - name: Install build tools
-        run: python -m pip install --upgrade pip  cibuildwheel==2.22.0 setuptools==75.3.0
+        run: python -m pip install --upgrade pip  setuptools==75.3.0
 
       - name: Build wheels
-        run: python -m cibuildwheel --output-dir wheelhouse
+        uses: pypa/cibuildwheel@v2.22.0
 
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
         with:
-          name: linux-wheel
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
-
-  build-windows:
-    name: Build windows Python wheel
-    runs-on: windows-2022
-    env:
-      CC: cl
-      CXX: cl
-#      CIBW_BUILD_VERBOSITY: 3
-
-    steps:
-      - name: Clone UP Fast Downward repository
-        uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v3
-
-      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.22.0
-
-      - uses: ilammy/msvc-dev-cmd@v1
-
-      - name: Build 64-bit wheel
-        run: python -m cibuildwheel --output-dir dist
+#  build-linux:
+#    name: Build linux Python wheels
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v4
+#
+#      - uses: actions/setup-python@v5
+#
+#      - name: Install build tools
+#        run: python -m pip install --upgrade pip  cibuildwheel==2.22.0 setuptools==75.3.0
+#
+#      - name: Build wheels
+#        run: python -m cibuildwheel --output-dir wheelhouse
+#
+#      - uses: actions/upload-artifact@master
+#        with:
+#          name: linux-wheel
+#          path: ./wheelhouse/*.whl
+#
+#
+#  build-windows:
+#    name: Build windows Python wheel
+#    runs-on: windows-2022
+#    env:
+#      CC: cl
+#      CXX: cl
+##      CIBW_BUILD_VERBOSITY: 3
+#
+#    steps:
+#      - name: Clone UP Fast Downward repository
+#        uses: actions/checkout@v4
+#
+#      - uses: actions/setup-python@v3
+#
+#      - name: Install cibuildwheel
+#        run: python -m pip install cibuildwheel==2.22.0
+#
+#      - uses: ilammy/msvc-dev-cmd@v1
+#
+#      - name: Build 64-bit wheel
+#        run: python -m cibuildwheel --output-dir dist
+##        env:
+##          CIBW_BUILD: cp36-win_amd64
+#
+#      - uses: actions/upload-artifact@master
+#        with:
+#          name: windows-wheel
+#          path: dist/*.whl
+#
+#
+#  build-mac:
+#    name: Build macOS Python wheel
+#    runs-on: macOS-11
+#    steps:
+#      - uses: actions/checkout@v4
+#
+#      - uses: actions/setup-python@v3
+#
+#      - name: Install cibuildwheel
+#        run: python -m pip install cibuildwheel==2.22.0
+#
+#      - name: Build wheel
+#        run: python -m cibuildwheel --output-dir dist
 #        env:
-#          CIBW_BUILD: cp36-win_amd64
-
-      - uses: actions/upload-artifact@master
-        with:
-          name: windows-wheel
-          path: dist/*.whl
-
-
-  build-mac:
-    name: Build macOS Python wheel
-    runs-on: macOS-11
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v3
-
-      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.22.0
-
-      - name: Build wheel
-        run: python -m cibuildwheel --output-dir dist
-        env:
-          CIBW_ARCHS_MACOS: "x86_64 arm64" 
-
-      - uses: actions/upload-artifact@master
-        with:
-          name: mac-wheel
-          path: dist/*.whl
+#          CIBW_ARCHS_MACOS: "x86_64 arm64" 
+#
+#      - uses: actions/upload-artifact@master
+#        with:
+#          name: mac-wheel
+#          path: dist/*.whl
 
 
   run-tox-test:
     name: Test wheels
-    needs: [build-linux, build-mac]
+      #needs: [build-linux, build-mac]
+    needs: [build-wheels]
     runs-on: ${{ matrix.version.os }}
     strategy:
       matrix:
         version:
           - {os: ubuntu-20.04, python: '3.8'}
           - {os: ubuntu-22.04, python: '3.10'}
-          - {os: macOS-11, python: '3.10'}
+          - {os: macOS-13, python: '3.10'}
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
@@ -132,7 +157,7 @@ jobs:
 
       - uses: actions/download-artifact@master
         with:
-          name: windows-wheel
+          name: cibw-wheels-windows-latest
           path: dist
 
       - name: Install Python