From 46fedce106223dc09cb382992b02ae3ace9f9fc4 Mon Sep 17 00:00:00 2001
From: Andrew Heard <andrewheard@google.com>
Date: Fri, 8 Nov 2024 11:11:13 -0500
Subject: [PATCH] [Infra] Update storage workflow to use macOS 15 for Xcode 16
 jobs

---
 .github/workflows/storage.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
index 4df045aae24..6c4f331dbde 100644
--- a/.github/workflows/storage.yml
+++ b/.github/workflows/storage.yml
@@ -25,7 +25,7 @@ jobs:
         language: [Swift, ObjC]
         include:
           - os: macos-15
-            xcode: Xcode_16
+            xcode: Xcode_16.1
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
     runs-on: ${{ matrix.os }}
@@ -96,22 +96,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:
@@ -200,8 +200,8 @@ jobs:
           - os: macos-14
             xcode: Xcode_15.3
             tests: --skip-tests
-          - os: macos-14
-            xcode: Xcode_16
+          - os: macos-15
+            xcode: Xcode_16.1
             tests: --test-specs=unit
     runs-on: ${{ matrix.os }}
     steps:
@@ -224,12 +224,12 @@ jobs:
     strategy:
       matrix:
         target: [ios, tvos, macos, watchos]
-        os: [macos-14]
+        os: [macos-14, macos-15]
         include:
           - os: macos-14
             xcode: Xcode_15.3
-          - os: macos-14
-            xcode: Xcode_16
+          - os: macos-15
+            xcode: Xcode_16.1
     runs-on: ${{ matrix.os }}
     needs: pod-lib-lint
     steps: