Skip to content

Commit ba5a2f1

Browse files
committed
chore(e2e): use gui for all macos unit tests; only run those on main
1 parent 8b70bdd commit ba5a2f1

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.evergreen/buildvariants-and-tasks.in.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ const UNIT_TESTS_BUILD_VARIANTS = [
1818
{
1919
name: 'unit-tests-macos',
2020
display_name: 'Unit Tests MacOS',
21-
run_on: 'macos-15-arm64',
22-
run_on_gui: 'macos-15-arm64-gui'
21+
// We only have gui variants of the macos 15, so both unit tests will be
22+
// running on it. We will not be running those on patches to save resources
23+
run_on: 'macos-15-arm64-gui',
24+
patchable: false,
2325
}
2426
];
2527
@@ -150,6 +152,7 @@ buildvariants:
150152

151153
display_name: <%= buildVariant.display_name %>
152154
run_on: <%= buildVariant.run_on %>
155+
patchable: <%= buildVariant.patchable ?? true %>
153156
tasks:
154157
- name: test
155158
- name: test-electron

.evergreen/buildvariants-and-tasks.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,31 @@ buildvariants:
99
- name: unit-tests-ubuntu
1010
display_name: Unit Tests Ubuntu
1111
run_on: ubuntu2204-large
12+
patchable: true
1213
tasks:
1314
- name: test
1415
- name: test-electron
1516
- name: unit-tests-windows
1617
display_name: Unit Tests Windows
1718
run_on: windows-vsCurrent-large
19+
patchable: true
1820
tasks:
1921
- name: test
2022
- name: test-electron
2123
- name: unit-tests-rhel
2224
display_name: Unit Tests RHEL
2325
run_on: rhel93-large
26+
patchable: true
2427
tasks:
2528
- name: test
2629
- name: test-electron
2730
- name: unit-tests-macos
2831
display_name: Unit Tests MacOS
29-
run_on: macos-15-arm64
32+
run_on: macos-15-arm64-gui
33+
patchable: true
3034
tasks:
3135
- name: test
3236
- name: test-electron
33-
run_on: macos-15-arm64-gui
3437
- name: package-ubuntu
3538
expansions:
3639
target_platform: ubuntu

0 commit comments

Comments
 (0)