Skip to content

Commit

Permalink
Switch to macos-latest in CI (#622)
Browse files Browse the repository at this point in the history
  • Loading branch information
DJMcNab authored Jun 28, 2024
1 parent fe8a27b commit 318948e
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@ env:
# Using cargo-hack also allows us to more easily test the feature matrix of our packages.
# We use --each-feature & --optional-deps which will run a separate check for every feature.
#
# We use macos-14 explicitly instead of macos-latest because:
# * macos-latest currently points to macos-12
# * macos-14 provides us with the GPU support we want for testing
# * macos-14 comes with the M1 CPU which compiles our code much faster than the older runners
# This explicit dependency can be switched back to macos-latest once it points to macos-14,
# which is expected to happen sometime in Q2 FY24 (April – June 2024).
# https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available/
#
# The MSRV jobs run only cargo check because different clippy versions can disagree on goals and
# running tests introduces dev dependencies which may require a higher MSRV than the bare package.

Expand Down Expand Up @@ -78,7 +70,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, macos-14, ubuntu-latest]
os: [windows-latest, macos-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -138,11 +130,11 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, macos-14, ubuntu-latest]
os: [windows-latest, macos-latest, ubuntu-latest]
include:
- os: ubuntu-latest
gpu: 'yes'
- os: macos-14
- os: macos-latest
gpu: 'yes'
- os: windows-latest
# TODO: The windows runners theoretically have CPU fallback for GPUs, but
Expand Down Expand Up @@ -226,7 +218,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, macos-14, ubuntu-latest]
os: [windows-latest, macos-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v4

Expand Down

0 comments on commit 318948e

Please sign in to comment.