Skip to content

chore(evergreen): use macos 15 DEVPROD-18250 #7531

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

chore(evergreen): use macos 15 DEVPROD-18250 #7531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b70bdd
chore(evergreen): use macos 15
gribnoysup Nov 3, 2025
f151c8d
chore(e2e): use gui for all macos unit tests; only run those on main
gribnoysup Nov 6, 2025
9c375f2
chore(e2e): revert temporary change to macos intel e2e being patchable
gribnoysup Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions .evergreen/buildvariants-and-tasks.in.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ const UNIT_TESTS_BUILD_VARIANTS = [
{
name: 'unit-tests-macos',
display_name: 'Unit Tests MacOS',
run_on: 'macos-14-arm64',
run_on_gui: 'macos-14-arm64-gui'
// We only have gui variants of the macos 15, so both unit tests will be
// running on it. We will not be running those on patches to save resources
run_on: 'macos-15-arm64-gui',
patchable: false,
}
];

Expand Down Expand Up @@ -89,15 +91,15 @@ const TEST_PACKAGED_APP_BUILD_VARIANTS = [
depends_on: 'package-macos-x64'
},
{
name: 'test-packaged-app-macos-14-arm',
display_name: 'MacOS arm64 14',
run_on: 'macos-14-arm64-gui',
name: 'test-packaged-app-macos-15-arm',
display_name: 'MacOS arm64 15',
run_on: 'macos-15-arm64-gui',
depends_on: 'package-macos-arm'
},
{
name: 'test-packaged-app-macos-14-x64',
display_name: 'MacOS x64 14',
run_on: 'macos-14-gui',
name: 'test-packaged-app-macos-15-x64',
display_name: 'MacOS x64 15',
run_on: 'macos-15-amd64-gui',
patchable: false,
depends_on: 'package-macos-x64'
}
Expand Down Expand Up @@ -150,6 +152,7 @@ buildvariants:

display_name: <%= buildVariant.display_name %>
run_on: <%= buildVariant.run_on %>
patchable: <%= buildVariant.patchable ?? true %>
tasks:
- name: test
- name: test-electron
Expand Down
21 changes: 12 additions & 9 deletions .evergreen/buildvariants-and-tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,31 @@ buildvariants:
- name: unit-tests-ubuntu
display_name: Unit Tests Ubuntu
run_on: ubuntu2204-large
patchable: true
tasks:
- name: test
- name: test-electron
- name: unit-tests-windows
display_name: Unit Tests Windows
run_on: windows-vsCurrent-large
patchable: true
tasks:
- name: test
- name: test-electron
- name: unit-tests-rhel
display_name: Unit Tests RHEL
run_on: rhel93-large
patchable: true
tasks:
- name: test
- name: test-electron
- name: unit-tests-macos
display_name: Unit Tests MacOS
run_on: macos-14-arm64
run_on: macos-15-arm64-gui
patchable: false
tasks:
- name: test
- name: test-electron
run_on: macos-14-arm64-gui
- name: package-ubuntu
expansions:
target_platform: ubuntu
Expand Down Expand Up @@ -212,9 +215,9 @@ buildvariants:
- name: test-packaged-app-macos-11-1
- name: test-packaged-app-macos-11-2
- name: test-packaged-app-macos-11-3
- name: test-packaged-app-macos-14-arm
display_name: Test Packaged App MacOS arm64 14
run_on: macos-14-arm64-gui
- name: test-packaged-app-macos-15-arm
display_name: Test Packaged App MacOS arm64 15
run_on: macos-15-arm64-gui
patchable: true
depends_on:
- name: package-compass
Expand All @@ -223,10 +226,10 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-macos-14-x64
display_name: Test Packaged App MacOS x64 14
run_on: macos-14-gui
patchable: false
- name: test-packaged-app-macos-15-x64
display_name: Test Packaged App MacOS x64 15
run_on: macos-15-amd64-gui
patchable: true
depends_on:
- name: package-compass
variant: package-macos-x64
Expand Down