From 7d607ee6f8ae1a8907ee82ff227ee455a5c8db38 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Tue, 30 Apr 2024 15:45:32 +0200
Subject: [PATCH] Switch to macos-latest and increase unloadDelay

---
 .github/workflows/canary.yml                  |  4 +--
 .github/workflows/ci.yml                      | 26 +++++++++----------
 .github/workflows/deflake.yml                 |  2 +-
 packages/browsers/src/browser-data/firefox.ts |  1 +
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
index e651ef49ea00f..2037fbb251f56 100644
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -24,7 +24,7 @@ jobs:
         os:
           - ubuntu-latest
           - windows-latest
-          - macos-13
+          - macos-latest
         shard:
           - 1-2
           - 2-2
@@ -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
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 314063230ca2e..ccf0328ba872e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -159,7 +159,7 @@ jobs:
         os:
           - ubuntu-latest
           - windows-latest
-          - macos-13
+          - macos-latest
         shard:
           - 1-2
           - 2-2
@@ -167,13 +167,13 @@ jobs:
           - 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
@@ -252,7 +252,7 @@ jobs:
           - firefox-headless
         os:
           - ubuntu-latest
-          - macos-13
+          - macos-latest
           - windows-latest
         shard:
           - 1-4
@@ -263,11 +263,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
@@ -335,12 +335,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@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
@@ -467,12 +467,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@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
@@ -521,12 +521,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@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
diff --git a/.github/workflows/deflake.yml b/.github/workflows/deflake.yml
index c5534558f688a..de4457421d213 100644
--- a/.github/workflows/deflake.yml
+++ b/.github/workflows/deflake.yml
@@ -33,7 +33,7 @@ on:
         options:
           - ubuntu-latest
           - windows-latest
-          - macos-13
+          - macos-latest
       retries:
         description: Number of retries per test
         required: false
diff --git a/packages/browsers/src/browser-data/firefox.ts b/packages/browsers/src/browser-data/firefox.ts
index 307ec5b52e9f4..d62616190981d 100644
--- a/packages/browsers/src/browser-data/firefox.ts
+++ b/packages/browsers/src/browser-data/firefox.ts
@@ -242,6 +242,7 @@ function defaultProfilePreferences(
     'browser.tabs.warnOnCloseOtherTabs': false,
     // Do not warn when multiple tabs will be opened
     'browser.tabs.warnOnOpen': false,
+    'browser.tabs.remote.unloadDelayMs': 1000,
 
     // Do not automatically offer translations, as tests do not expect this.
     'browser.translations.automaticallyPopup': false,