[CHORE] macos xl runners are 0.32/minute not hour... (#1417)

Eventual-Inc · Sep 25, 2023 · 38ccd44 · 38ccd44
1 parent d7d1ae0
commit 38ccd44
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -26,15 +26,15 @@ env:
 jobs:
   build-and-test:
 
-    name: platform wheels for ${{ matrix.runs }}-${{ matrix.compile_arch }}
-    runs-on: ${{ matrix.runs }}
+    name: platform wheels for ${{ matrix.os }}-${{ matrix.compile_arch }}
+    runs-on: ${{ matrix.os }}-latest
     strategy:
       fail-fast: false
       matrix:
-        runs: [ubuntu-latest, macos-latest-xl, windows-latest-l]
+        os: [ubuntu, macos, windows]
         compile_arch: [x86_64, aarch64]
         exclude:
-        - runs: windows-latest-l
+        - os: windows
           compile_arch: aarch64
     steps:
     - uses: actions/checkout@v4
@@ -48,15 +48,15 @@ jobs:
     - run: pip install -U twine toml
     - run: python tools/patch_package_version.py
     - name: Build wheels - Mac and Windows x86
-      if: ${{ ((matrix.runs == 'macos-latest-xl') || (matrix.runs == 'windows-latest-l')) && (matrix.compile_arch == 'x86_64')  }}
+      if: ${{ ((matrix.os == 'macos') || (matrix.os == 'windows')) && (matrix.compile_arch == 'x86_64')  }}
       uses: messense/maturin-action@v1
       with:
         target: x86_64
         args: --profile release-lto --out dist --sdist
       env:
         RUSTFLAGS: -C target-feature=+fxsr,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2
     - name: Build wheels - Linux x86
-      if: ${{ (matrix.runs == 'ubuntu-latest') && (matrix.compile_arch == 'x86_64') }}
+      if: ${{ (matrix.os == 'ubuntu') && (matrix.compile_arch == 'x86_64') }}
       uses: messense/maturin-action@v1
       with:
         target: x86_64
@@ -66,7 +66,7 @@ jobs:
       env:
         RUSTFLAGS: -C target-feature=+fxsr,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+popcnt,+avx,+fma
     - name: Build wheels - Linux aarch64
-      if: ${{ (matrix.runs == 'ubuntu-latest') && (matrix.compile_arch == 'aarch64') }}
+      if: ${{ (matrix.os == 'ubuntu') && (matrix.compile_arch == 'aarch64') }}
       uses: messense/maturin-action@v1
       with:
         target: aarch64-unknown-linux-gnu
@@ -77,7 +77,7 @@ jobs:
         before-script-linux: export JEMALLOC_SYS_WITH_LG_PAGE=16
 
     - name: Build wheels - Mac aarch64
-      if: ${{ (matrix.runs == 'macos-latest-xl') && (matrix.compile_arch == 'aarch64')  }}
+      if: ${{ (matrix.os == 'macos') && (matrix.compile_arch == 'aarch64')  }}
       uses: messense/maturin-action@v1
       with:
         target: aarch64
@@ -87,14 +87,14 @@ jobs:
         RUSTFLAGS: -Ctarget-cpu=apple-m1
 
     - name: Install and test built wheel - Linux and Mac x86_64
-      if: ${{ ((matrix.runs == 'macos-latest-xl') || (matrix.runs == 'ubuntu-latest')) && (matrix.compile_arch == 'x86_64')  }}
+      if: ${{ ((matrix.os == 'macos') || (matrix.os == 'ubuntu')) && (matrix.compile_arch == 'x86_64')  }}
       run: |
         pip install -r requirements-dev.txt dist/${{ env.PACKAGE_NAME }}-*x86_64*.whl --force-reinstall
         rm -rf daft
         pytest -v
 
     - name: Install and test built wheel - Windows x86_64
-      if: ${{ (matrix.runs == 'windows-latest-l') && (matrix.compile_arch == 'x86_64')  }}
+      if: ${{ (matrix.os == 'windows') && (matrix.compile_arch == 'x86_64')  }}
       run: |
         $FILES = Get-ChildItem -Path .\dist\${{ env.PACKAGE_NAME }}-*-win_amd64.whl -Force -Recurse
         pip install -r requirements-dev.txt $FILES[0].FullName --force-reinstall