devops: align macOS versions in workflows (#32871)

This commit is contained in:
Max Schmitt 2024-09-30 12:42:47 +02:00 committed by GitHub
parent aa3146785f
commit d3e38c32af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 11 deletions

View File

@ -24,9 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# Stick with macos-latest-large for now which is Intel-based until
# https://github.com/microsoft/playwright/issues/30705 is fixed.
os: [ubuntu-latest, macos-latest-large, windows-latest]
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4

View File

@ -50,14 +50,14 @@ jobs:
strategy:
fail-fast: false
matrix:
# Intel: macos-13, macos-14-large, macos-15-large
# Arm64: macos-13-xlarge, macos-14 macos-15
os: [macos-13, macos-13-xlarge, macos-14-large, macos-14]
# Intel: *-large
# Arm64: *-xlarge
os: [macos-13-large, macos-13-xlarge, macos-14-large, macos-14-xlarge]
browser: [chromium, firefox, webkit]
include:
- os: macos-15-large
browser: webkit
- os: macos-15
- os: macos-15-xlarge
browser: webkit
runs-on: ${{ matrix.os }}
steps:
@ -123,7 +123,7 @@ jobs:
fail-fast: false
matrix:
browser: [chromium, firefox, webkit]
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-14, windows-latest]
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-14-xlarge, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
@ -314,9 +314,7 @@ jobs:
firefox_beta_mac:
name: "Firefox Beta (Mac)"
environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
# Stick with macos-latest-large for now which is Intel-based until
# https://github.com/microsoft/playwright/issues/30705 is fixed.
runs-on: macos-latest-large
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/run-test