From 9f870645bc2fa9982febb0d12feb8579b797410c Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Fri, 25 Oct 2024 06:36:27 -0700
Subject: [PATCH 1/3] Tweaks for flaky tests

---
 .github/workflows/database.yml     | 2 +-
 .github/workflows/remoteconfig.yml | 2 +-
 .github/workflows/storage.yml      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index 86e1f42a109..369f6d9ea74 100644
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -42,7 +42,7 @@ jobs:
   integration:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
     - uses: actions/checkout@v4
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
diff --git a/.github/workflows/remoteconfig.yml b/.github/workflows/remoteconfig.yml
index 4fbf6aa191d..c9229b38bdd 100644
--- a/.github/workflows/remoteconfig.yml
+++ b/.github/workflows/remoteconfig.yml
@@ -132,7 +132,7 @@ jobs:
             target: macOS
           - os: macos-15
             xcode: Xcode_16
-            target: watchOS
+            target: watchOS --skip-tests
           - os: macos-15
             xcode: Xcode_16
             target: catalyst
diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
index eb1dd9f8f0f..4df045aae24 100644
--- a/.github/workflows/storage.yml
+++ b/.github/workflows/storage.yml
@@ -24,8 +24,8 @@ jobs:
       matrix:
         language: [Swift, ObjC]
         include:
-          - os: macos-14
-            xcode: Xcode_15.4
+          - os: macos-15
+            xcode: Xcode_16
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
     runs-on: ${{ matrix.os }}

From bb751606cc436aca895651b283a41517101273c0 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Fri, 25 Oct 2024 07:08:23 -0700
Subject: [PATCH 2/3] fix

---
 .github/workflows/remoteconfig.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/remoteconfig.yml b/.github/workflows/remoteconfig.yml
index c9229b38bdd..eb5cae871c7 100644
--- a/.github/workflows/remoteconfig.yml
+++ b/.github/workflows/remoteconfig.yml
@@ -118,27 +118,35 @@ jobs:
           - os: macos-13
             xcode: Xcode_15.2
             target: iOS
+            test: spm
           - os: macos-14
             xcode: Xcode_15.4
             target: iOS
+            test: spm
           - os: macos-15
             xcode: Xcode_16
             target: iOS
+            test: spm
           - os: macos-15
             xcode: Xcode_16
             target: tvOS
+            test: spm
           - os: macos-15
             xcode: Xcode_16
             target: macOS
+            test: spm
           - os: macos-15
             xcode: Xcode_16
-            target: watchOS --skip-tests
+            target: watchOS
+            test: spmbuildonly
           - os: macos-15
             xcode: Xcode_16
             target: catalyst
+            test: spm
           - os: macos-15
             xcode: Xcode_16
             target: visionOS
+            test: spm
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -153,7 +161,7 @@ jobs:
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh RemoteConfigUnit ${{ matrix.target }} spm
     - name: Fake Console tests
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh RemoteConfigFakeConsole ${{ matrix.target }} spm
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh RemoteConfigFakeConsole ${{ matrix.target }} ${{ matrix.test }}
 
   catalyst:
     # Don't run on private repo unless it is a PR.

From a3a39a644be45c2a8cf1c6c0c1f673f61906cc92 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Fri, 25 Oct 2024 07:55:03 -0700
Subject: [PATCH 3/3] back to Xcode 15 for rtdb integration

---
 .github/workflows/database.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index 369f6d9ea74..7570be9c9bd 100644
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -42,7 +42,7 @@ jobs:
   integration:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-    runs-on: macos-15
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -53,6 +53,8 @@ jobs:
       run: scripts/setup_bundler.sh
     - name: Install xcpretty
       run: gem install xcpretty
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
     - name: IntegrationTest
       # Only iOS to mitigate flakes.
       run: scripts/third_party/travis/retry.sh scripts/build.sh Database iOS integration