From 8b70bdd879574fe0ee497a9a5a1d906d71252b14 Mon Sep 17 00:00:00 2001 From: Sergey Petushkov Date: Mon, 3 Nov 2025 15:29:56 +0100 Subject: [PATCH 1/3] chore(evergreen): use macos 15 --- .evergreen/buildvariants-and-tasks.in.yml | 18 +++++++++--------- .evergreen/buildvariants-and-tasks.yml | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml index e61fea350e3..fc913f7cb68 100644 --- a/.evergreen/buildvariants-and-tasks.in.yml +++ b/.evergreen/buildvariants-and-tasks.in.yml @@ -18,8 +18,8 @@ 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' + run_on: 'macos-15-arm64', + run_on_gui: 'macos-15-arm64-gui' } ]; @@ -89,16 +89,16 @@ 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', - patchable: false, + name: 'test-packaged-app-macos-15-x64', + display_name: 'MacOS x64 15', + run_on: 'macos-15-amd64-gui', + patchable: true, // TODO: just to test that this works, revert before merging depends_on: 'package-macos-x64' } ]; diff --git a/.evergreen/buildvariants-and-tasks.yml b/.evergreen/buildvariants-and-tasks.yml index 29222711d29..9ea7eede99c 100644 --- a/.evergreen/buildvariants-and-tasks.yml +++ b/.evergreen/buildvariants-and-tasks.yml @@ -26,11 +26,11 @@ buildvariants: - name: test-electron - name: unit-tests-macos display_name: Unit Tests MacOS - run_on: macos-14-arm64 + run_on: macos-15-arm64 tasks: - name: test - name: test-electron - run_on: macos-14-arm64-gui + run_on: macos-15-arm64-gui - name: package-ubuntu expansions: target_platform: ubuntu @@ -212,9 +212,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 @@ -223,10 +223,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 From f151c8def066b92a63a15ac61699b5c8417aa62b Mon Sep 17 00:00:00 2001 From: Sergey Petushkov Date: Thu, 6 Nov 2025 18:46:27 +0100 Subject: [PATCH 2/3] chore(e2e): use gui for all macos unit tests; only run those on main --- .evergreen/buildvariants-and-tasks.in.yml | 7 +++++-- .evergreen/buildvariants-and-tasks.yml | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml index fc913f7cb68..9984751c5bc 100644 --- a/.evergreen/buildvariants-and-tasks.in.yml +++ b/.evergreen/buildvariants-and-tasks.in.yml @@ -18,8 +18,10 @@ const UNIT_TESTS_BUILD_VARIANTS = [ { name: 'unit-tests-macos', display_name: 'Unit Tests MacOS', - run_on: 'macos-15-arm64', - run_on_gui: 'macos-15-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, } ]; @@ -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 diff --git a/.evergreen/buildvariants-and-tasks.yml b/.evergreen/buildvariants-and-tasks.yml index 9ea7eede99c..0c3a866a989 100644 --- a/.evergreen/buildvariants-and-tasks.yml +++ b/.evergreen/buildvariants-and-tasks.yml @@ -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-15-arm64 + run_on: macos-15-arm64-gui + patchable: false tasks: - name: test - name: test-electron - run_on: macos-15-arm64-gui - name: package-ubuntu expansions: target_platform: ubuntu From 9c375f268ae0bd969af4d9f930d735e05daae004 Mon Sep 17 00:00:00 2001 From: Sergey Petushkov Date: Thu, 6 Nov 2025 19:04:16 +0100 Subject: [PATCH 3/3] chore(e2e): revert temporary change to macos intel e2e being patchable --- .evergreen/buildvariants-and-tasks.in.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml index 9984751c5bc..881a8ec6d76 100644 --- a/.evergreen/buildvariants-and-tasks.in.yml +++ b/.evergreen/buildvariants-and-tasks.in.yml @@ -100,7 +100,7 @@ const TEST_PACKAGED_APP_BUILD_VARIANTS = [ name: 'test-packaged-app-macos-15-x64', display_name: 'MacOS x64 15', run_on: 'macos-15-amd64-gui', - patchable: true, // TODO: just to test that this works, revert before merging + patchable: false, depends_on: 'package-macos-x64' } ];