From 9510454ca6bc9a89f529de2e0d9b780217cfd6d7 Mon Sep 17 00:00:00 2001
From: Andrew Heard <andrewheard@google.com>
Date: Fri, 8 Nov 2024 14:52:00 -0500
Subject: [PATCH 1/2] [Infra] Update database workflow to use macOS 15 for
 Xcode 16

---
 .github/workflows/database.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index 7570be9c9bd..cd7ccaecc22 100644
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -26,8 +26,11 @@ jobs:
     strategy:
       matrix:
         target: [ios, tvos, macos --skip-tests, watchos]
-        os: [macos-14]
-        xcode: [Xcode_15.2, Xcode_16]
+        include:
+          - os: macos-14
+            xcode: Xcode_15.2
+          - os: macos-15
+            xcode: Xcode_16.1
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -96,22 +99,22 @@ jobs:
             xcode: Xcode_15.4
             target: iOS
           - os: macos-15
-            xcode: Xcode_16
+            xcode: Xcode_16.1
             target: iOS
           - os: macos-15
-            xcode: Xcode_16
+            xcode: Xcode_16.1
             target: tvOS
           - os: macos-15
-            xcode: Xcode_16
+            xcode: Xcode_16.1
             target: macOS
           - os: macos-15
-            xcode: Xcode_16
+            xcode: Xcode_16.1
             target: watchOS
           - os: macos-15
-            xcode: Xcode_16
+            xcode: Xcode_16.1
             target: catalyst
           - os: macos-15
-            xcode: Xcode_16
+            xcode: Xcode_16.1
             target: visionOS
     runs-on: ${{ matrix.os }}
     steps:

From 73e4b881d2c94f8210fd94010b95a820ae7af851 Mon Sep 17 00:00:00 2001
From: Andrew Heard <andrewheard@google.com>
Date: Fri, 8 Nov 2024 17:10:12 -0500
Subject: [PATCH 2/2] Fix missing `pod lib lint` `Xcode 15.2` runs

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

diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index cd7ccaecc22..5b390d0184a 100644
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -26,19 +26,19 @@ jobs:
     strategy:
       matrix:
         target: [ios, tvos, macos --skip-tests, watchos]
-        include:
+        build-env:
           - os: macos-14
             xcode: Xcode_15.2
           - os: macos-15
             xcode: Xcode_16.1
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.build-env.os }}
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: Xcode
-      run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
     - name: Build and test
       run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseDatabase.podspec --test-specs=unit --platforms=${{ matrix.target }}