Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: switch to macos-latest #12328

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
os:
- ubuntu-latest
- windows-latest
- macos-13
- macos-latest
shard:
- 1-2
- 2-2
Expand All @@ -34,7 +34,7 @@ jobs:
exclude:
- os: windows-latest
suite: chrome-bidi
- os: macos-13
- os: macos-latest
suite: chrome-headful
steps:
- name: Check out repository
Expand Down
28 changes: 15 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,21 +159,21 @@ jobs:
os:
- ubuntu-latest
- windows-latest
- macos-13
- macos-latest
shard:
- 1-2
- 2-2
exclude:
- linux-only: true
os: windows-latest
- linux-only: true
os: macos-13
os: macos-latest
- linux-only: true
suite: chrome-headful

- os: windows-latest
suite: chrome-bidi
- os: macos-13
- os: macos-latest
suite: chrome-headful
steps:
- name: Check out repository
Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
- firefox-headless
os:
- ubuntu-latest
- macos-13
- macos-latest
- windows-latest
shard:
- 1-4
Expand All @@ -269,11 +269,11 @@ jobs:
- linux-only: true
os: windows-latest
- linux-only: true
os: macos-13
os: macos-latest

- os: macos-13
- os: macos-latest
suite: firefox-headful
- os: macos-13
- os: macos-latest
suite: firefox-headless
- os: windows-latest
suite: firefox-headful
Expand Down Expand Up @@ -307,6 +307,8 @@ jobs:
- name: Run all tests (for non-Linux)
if: ${{ matrix.os != 'ubuntu-latest' }}
run: npm run test -- --shard '${{ matrix.shard }}' --test-suite ${{ matrix.suite }} --save-stats-to /tmp/artifacts/${{ github.event_name }}_INSERTID.json
env:
MOZ_LOG: "BCWebProgress:5"
- name: Run all tests (for Linux)
if: ${{ matrix.os == 'ubuntu-latest' }}
run: xvfb-run --auto-servernum npm run test -- --shard '${{ matrix.shard }}' --test-suite ${{ matrix.suite }} --save-stats-to /tmp/artifacts/${{ github.event_name }}_INSERTID.json
Expand Down Expand Up @@ -341,12 +343,12 @@ jobs:
os:
- ubuntu-latest
- windows-latest
- macos-13
- macos-latest
exclude:
- linux-only: true
os: windows-latest
- linux-only: true
os: macos-13
os: macos-latest
steps:
- name: Check out repository
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
Expand Down Expand Up @@ -473,12 +475,12 @@ jobs:
os:
- ubuntu-latest
- windows-latest
- macos-13
- macos-latest
exclude:
- linux-only: true
os: windows-latest
- linux-only: true
os: macos-13
os: macos-latest
steps:
- name: Checkout
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
Expand Down Expand Up @@ -527,12 +529,12 @@ jobs:
os:
- ubuntu-latest
- windows-latest
- macos-13
- macos-latest
exclude:
- linux-only: true
os: windows-latest
- linux-only: true
os: macos-13
os: macos-latest
steps:
- name: Checkout
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deflake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ on:
options:
- ubuntu-latest
- windows-latest
- macos-13
- macos-latest
retries:
description: Number of retries per test
required: false
Expand Down
2 changes: 1 addition & 1 deletion tools/analyze_issue.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ This issue has an invalid Puppeteer version: \`${value}\`. Versions must follow
runsOn = 'windows-latest';
break;
case 'macos':
runsOn = 'macos-13';
runsOn = 'macos-latest';
break;
case 'linux':
runsOn = 'ubuntu-latest';
Expand Down