From 3606979ec09bb424cd54ba309cfe757b15793b0d Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Tue, 31 Oct 2023 08:38:11 -0700
Subject: [PATCH 1/8] Run Messaging CI on Xcode 15

---
 .github/workflows/messaging.yml | 61 ++++++++++++++++++++-------------
 .github/workflows/storage.yml   | 14 ++++----
 2 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml
index 5b4f5524f8a..a995812fc74 100644
--- a/.github/workflows/messaging.yml
+++ b/.github/workflows/messaging.yml
@@ -28,7 +28,7 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v3
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -46,6 +46,8 @@ jobs:
         mkdir FirebaseMessaging/Tests/IntegrationTests/Resources
         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/messaging-sample-plist.gpg \
           FirebaseMessaging/Tests/IntegrationTests/Resources/GoogleService-Info.plist "$plist_secret"
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/xcode_15.0.1.app/Contents/Developer
     - name: BuildAndTest # can be replaced with pod lib lint with CocoaPods 1.10
       run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/build.sh Messaging all)
 
@@ -53,44 +55,40 @@ jobs:
   pod-lib-lint:
     # 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-12
-
     strategy:
       matrix:
         podspec: [FirebaseMessagingInterop.podspec, FirebaseMessaging.podspec]
         target: [ios, tvos, macos --skip-tests, watchos --skip-tests] # skipping tests on mac because of keychain access
+        os: [macos-12, macos-13]
+        include:
+          - os: macos-12
+            xcode: Xcode_14.2
+          - os: macos-13
+            xcode: xcode_15.0.1
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
     - 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
     - name: Build and test
       run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }}
 
   spm:
     # 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-12
-    strategy:
-      matrix:
-        target: [iOS, watchOS]
-    steps:
-    - uses: actions/checkout@v3
-    - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
-      with:
-        cache_key: ${{ matrix.os }}
-    - name: Initialize xcodebuild
-      run: scripts/setup_spm_tests.sh
-    - name: Unit Tests
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh MessagingUnit ${{ matrix.target }} spm
-
-  spm-cron:
-    # Don't run on private repo.
-    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
-    runs-on: macos-12
     strategy:
       matrix:
-        target: [tvOS, macOS, catalyst]
+        target: [iOS, watchOS, tvOS, macOS, catalyst]
+        os: [macos-12, macos-13]
+        include:
+          - os: macos-12
+            xcode: Xcode_14.2
+          - os: macos-13
+            xcode: xcode_15.0.1
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -98,6 +96,8 @@ jobs:
         cache_key: ${{ matrix.os }}
     - name: Initialize xcodebuild
       run: scripts/setup_spm_tests.sh
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh MessagingUnit ${{ matrix.target }} spm
 
@@ -122,7 +122,14 @@ jobs:
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-    runs-on: macos-12
+    strategy:
+      matrix:
+        include:
+          - os: macos-12
+            xcode: Xcode_14.2
+          - os: macos-13
+            xcode: xcode_15.0.1
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
@@ -131,6 +138,8 @@ jobs:
     - name: Install Secret GoogleService-Info.plist
       run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-messaging.plist.gpg \
           quickstart-ios/messaging/GoogleService-Info.plist "$plist_secret"
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
     - name: Test objc quickstart
       run: ([ -z $plist_secret ] ||
             scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Messaging false)
@@ -205,6 +214,8 @@ jobs:
           FirebaseMessaging/Apps/Shared/GoogleService-Info.plist "$plist_secret"
     - name: Prereqs
       run: scripts/install_prereqs.sh MessagingSample iOS
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode15.0.1.app/Contents/Developer
     - name: Build
       run: ([ -z $plist_secret ] || scripts/build.sh MessagingSample iOS)
 
@@ -228,6 +239,8 @@ jobs:
           FirebaseMessaging/Apps/Shared/GoogleService-Info.plist "$plist_secret"
     - name: Prereqs
       run: scripts/install_prereqs.sh SwiftUISample iOS
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode15.0.1.app/Contents/Developer
     - name: Build
       run: ([ -z $plist_secret ] || scripts/build.sh SwiftUISample iOS)
 
@@ -251,6 +264,8 @@ jobs:
           FirebaseMessaging/Apps/Shared/GoogleService-Info.plist "$plist_secret"
     - name: Prereqs
       run: scripts/install_prereqs.sh MessagingSampleStandaloneWatchApp watchOS
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode15.0.1.app/Contents/Developer
     - name: Build
       run: ([ -z $plist_secret ] || scripts/build.sh MessagingSampleStandaloneWatchApp watchOS)
 
diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
index 940cb5a4816..1aafe664a3c 100644
--- a/.github/workflows/storage.yml
+++ b/.github/workflows/storage.yml
@@ -27,7 +27,7 @@ jobs:
           # - os: macos-12
           #   xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
     runs-on: ${{ matrix.os }}
@@ -65,7 +65,7 @@ jobs:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -81,7 +81,7 @@ jobs:
 
   spm-cron:
     # Don't run on private repo.
-#    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
+    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
     strategy:
       matrix:
         target: [tvOS, macOS, catalyst, watchOS]
@@ -90,7 +90,7 @@ jobs:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -115,7 +115,7 @@ jobs:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -174,7 +174,7 @@ jobs:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -191,7 +191,7 @@ jobs:
 
   storage-cron-only:
     # Don't run on private repo.
-#    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
+    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
     strategy:
       matrix:
         target: [ios, tvos, macos, watchos]

From 8928b2061eb2871adf87c1659c616dfd3e84525a Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Tue, 31 Oct 2023 08:53:10 -0700
Subject: [PATCH 2/8] fixes

---
 .github/workflows/messaging.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml
index a995812fc74..e355b77640e 100644
--- a/.github/workflows/messaging.yml
+++ b/.github/workflows/messaging.yml
@@ -177,20 +177,28 @@ jobs:
 
   messaging-cron-only:
     # Don't run on private repo.
-    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
+#    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
     runs-on: macos-12
     strategy:
       matrix:
         target: [ios, tvos, macos --skip-tests, watchos --skip-tests]
         flags: [
-          '--use-modular-headers'
+          '--use-static-frameworks'
         ]
+        os: [macos-12, macos-13]
+        include:
+          - os: macos-12
+            xcode: Xcode_14.2
+          - os: macos-13
+            xcode: xcode_15.0.1
     needs: pod-lib-lint
     steps:
     - uses: actions/checkout@v3
     - 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
     - name: PodLibLint Messaging Cron
       run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=${{ matrix.target }}
 
@@ -199,7 +207,7 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v3
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -224,7 +232,7 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v3
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -249,7 +257,7 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v3
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

From 0e708bab8de0dee8e294756bb98c042910bdcfd2 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Tue, 31 Oct 2023 09:14:10 -0700
Subject: [PATCH 3/8] Fixes

---
 .github/workflows/messaging.yml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml
index e355b77640e..06f864ad74d 100644
--- a/.github/workflows/messaging.yml
+++ b/.github/workflows/messaging.yml
@@ -64,7 +64,7 @@ jobs:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -87,7 +87,7 @@ jobs:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -128,7 +128,7 @@ jobs:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -178,19 +178,16 @@ jobs:
   messaging-cron-only:
     # Don't run on private repo.
 #    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
-    runs-on: macos-12
     strategy:
       matrix:
         target: [ios, tvos, macos --skip-tests, watchos --skip-tests]
-        flags: [
-          '--use-static-frameworks'
-        ]
         os: [macos-12, macos-13]
         include:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
+    runs-on: ${{ matrix.os }}
     needs: pod-lib-lint
     steps:
     - uses: actions/checkout@v3
@@ -200,7 +197,7 @@ jobs:
     - name: Xcode
       run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
     - name: PodLibLint Messaging Cron
-      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=${{ matrix.target }}
+      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=${{ matrix.target }} --use-static-frameworks
 
   messaging-sample-build-test:
     # Don't run on private repo unless it is a PR.
@@ -223,7 +220,7 @@ jobs:
     - name: Prereqs
       run: scripts/install_prereqs.sh MessagingSample iOS
     - name: Xcode
-      run: sudo xcode-select -s /Applications/Xcode15.0.1.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/Xcode_15.0.1.app/Contents/Developer
     - name: Build
       run: ([ -z $plist_secret ] || scripts/build.sh MessagingSample iOS)
 
@@ -248,7 +245,7 @@ jobs:
     - name: Prereqs
       run: scripts/install_prereqs.sh SwiftUISample iOS
     - name: Xcode
-      run: sudo xcode-select -s /Applications/Xcode15.0.1.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/Xcode_15.0.1.app/Contents/Developer
     - name: Build
       run: ([ -z $plist_secret ] || scripts/build.sh SwiftUISample iOS)
 
@@ -273,7 +270,7 @@ jobs:
     - name: Prereqs
       run: scripts/install_prereqs.sh MessagingSampleStandaloneWatchApp watchOS
     - name: Xcode
-      run: sudo xcode-select -s /Applications/Xcode15.0.1.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/Xcode_15.0.1.app/Contents/Developer
     - name: Build
       run: ([ -z $plist_secret ] || scripts/build.sh MessagingSampleStandaloneWatchApp watchOS)
 

From 3361112b2614ec7a75f2baf4dbda8727dffc4769 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Tue, 31 Oct 2023 09:43:36 -0700
Subject: [PATCH 4/8] unblock cron

---
 .github/workflows/messaging.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml
index 06f864ad74d..426a1597975 100644
--- a/.github/workflows/messaging.yml
+++ b/.github/workflows/messaging.yml
@@ -188,7 +188,6 @@ jobs:
           - os: macos-13
             xcode: Xcode_15.0.1
     runs-on: ${{ matrix.os }}
-    needs: pod-lib-lint
     steps:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1

From 30052a8272a701ce9d2ef4eb3f9772b271e4318e Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Tue, 31 Oct 2023 11:21:44 -0700
Subject: [PATCH 5/8] Distinguish unit and integration tests

---
 .github/workflows/messaging.yml |  8 ++++----
 scripts/build.sh                | 26 --------------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml
index 426a1597975..06575add369 100644
--- a/.github/workflows/messaging.yml
+++ b/.github/workflows/messaging.yml
@@ -23,7 +23,7 @@ concurrency:
 
 jobs:
 
-  messaging:
+  messaging-integration-tests:
     # 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'
     env:
@@ -48,7 +48,7 @@ jobs:
           FirebaseMessaging/Tests/IntegrationTests/Resources/GoogleService-Info.plist "$plist_secret"
     - name: Xcode
       run: sudo xcode-select -s /Applications/xcode_15.0.1.app/Contents/Developer
-    - name: BuildAndTest # can be replaced with pod lib lint with CocoaPods 1.10
+    - name: BuildAndTest
       run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/build.sh Messaging all)
 
 
@@ -74,7 +74,7 @@ jobs:
     - name: Xcode
       run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
     - name: Build and test
-      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }}
+      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} --test-specs=unit --platforms=${{ matrix.target }}
 
   spm:
     # Don't run on private repo unless it is a PR.
@@ -196,7 +196,7 @@ jobs:
     - name: Xcode
       run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
     - name: PodLibLint Messaging Cron
-      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=${{ matrix.target }} --use-static-frameworks
+      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseMessaging.podspec --test-specs=unit --platforms=${{ matrix.target }} --use-static-frameworks
 
   messaging-sample-build-test:
     # Don't run on private repo unless it is a PR.
diff --git a/scripts/build.sh b/scripts/build.sh
index 6b70e0bdde5..d33d1633ae8 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -377,14 +377,6 @@ case "$product-$platform-$method" in
       AppHost-FirebaseMessaging-Unit-Tests \
       ../../../FirebaseMessaging/Tests/IntegrationTests/Resources/GoogleService-Info.plist
 
-    RunXcodebuild \
-      -workspace 'gen/FirebaseMessaging/FirebaseMessaging.xcworkspace' \
-      -scheme "FirebaseMessaging-Unit-unit" \
-      "${ios_flags[@]}" \
-      "${xcb_flags[@]}" \
-      build \
-      test
-
     if check_secrets; then
       # Integration tests are only run on iOS to minimize flake failures.
       RunXcodebuild \
@@ -394,24 +386,6 @@ case "$product-$platform-$method" in
         "${xcb_flags[@]}" \
         test
     fi
-
-    pod_gen FirebaseMessaging.podspec --platforms=macos --clean
-    RunXcodebuild \
-      -workspace 'gen/FirebaseMessaging/FirebaseMessaging.xcworkspace' \
-      -scheme "FirebaseMessaging-Unit-unit" \
-      "${macos_flags[@]}" \
-      "${xcb_flags[@]}" \
-      build \
-      test
-
-    pod_gen FirebaseMessaging.podspec --platforms=tvos --clean
-    RunXcodebuild \
-      -workspace 'gen/FirebaseMessaging/FirebaseMessaging.xcworkspace' \
-      -scheme "FirebaseMessaging-Unit-unit" \
-      "${tvos_flags[@]}" \
-      "${xcb_flags[@]}" \
-      build \
-      test
     ;;
 
   MessagingSample-*-*)

From a6bcafbe55e4cbfca02db2dd37275540c59352a2 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Tue, 31 Oct 2023 15:55:32 -0700
Subject: [PATCH 6/8] visionOS CI

---
 .github/workflows/messaging.yml | 5 ++++-
 .github/workflows/storage.yml   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml
index 06575add369..e880be8ceff 100644
--- a/.github/workflows/messaging.yml
+++ b/.github/workflows/messaging.yml
@@ -81,13 +81,16 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     strategy:
       matrix:
-        target: [iOS, watchOS, tvOS, macOS, catalyst]
+        target: [iOS, watchOS, tvOS, macOS, catalyst, visionOS]
         os: [macos-12, macos-13]
         include:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
             xcode: Xcode_15.0.1
+        exclude:
+          - os: macos-12
+            target: visionOS
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
index 1aafe664a3c..8343b5aaaa2 100644
--- a/.github/workflows/storage.yml
+++ b/.github/workflows/storage.yml
@@ -194,13 +194,16 @@ jobs:
     if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
     strategy:
       matrix:
-        target: [ios, tvos, macos, watchos]
+        target: [ios, tvos, macos, watchos, visionOS]
         os: [macos-12, macos-13]
         include:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
             xcode: xcode_15.0.1
+        exclude:
+          - os: macos-12
+            target: visionOS
     runs-on: ${{ matrix.os }}
     needs: pod-lib-lint
     steps:

From 410040b58f86978371d8643ef7ab9bf925e4c55b Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Tue, 31 Oct 2023 17:32:06 -0700
Subject: [PATCH 7/8] Defer messaging integration tests

---
 .github/workflows/messaging.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml
index e880be8ceff..5326f0da219 100644
--- a/.github/workflows/messaging.yml
+++ b/.github/workflows/messaging.yml
@@ -28,7 +28,9 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-    runs-on: macos-13
+      # TODO: Investigate why PubSub integration tests fail with Xcode 15.0.1 on macos-13
+#    runs-on: macos-13
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v3
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -46,12 +48,11 @@ jobs:
         mkdir FirebaseMessaging/Tests/IntegrationTests/Resources
         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/messaging-sample-plist.gpg \
           FirebaseMessaging/Tests/IntegrationTests/Resources/GoogleService-Info.plist "$plist_secret"
-    - name: Xcode
-      run: sudo xcode-select -s /Applications/xcode_15.0.1.app/Contents/Developer
+#    - name: Xcode
+#      run: sudo xcode-select -s /Applications/xcode_15.0.1.app/Contents/Developer
     - name: BuildAndTest
       run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/build.sh Messaging all)
 
-
   pod-lib-lint:
     # 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'
@@ -180,7 +181,7 @@ jobs:
 
   messaging-cron-only:
     # Don't run on private repo.
-#    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
+    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
     strategy:
       matrix:
         target: [ios, tvos, macos --skip-tests, watchos --skip-tests]

From 534f6db076e1365ae76c8542da5577ac4d3cced8 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Wed, 1 Nov 2023 06:35:49 -0700
Subject: [PATCH 8/8] Undo Storage integration tests on XC 15 for now

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

diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
index 8343b5aaaa2..a0113f2bc8e 100644
--- a/.github/workflows/storage.yml
+++ b/.github/workflows/storage.yml
@@ -17,17 +17,17 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
-  storage:
+  storage-integration-tests:
     # 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'
     strategy:
       matrix:
         include:
-          # Only one os to avoid contention in the integration tests.
-          # - os: macos-12
-          #   xcode: Xcode_14.2
-          - os: macos-13
-            xcode: Xcode_15.0.1
+          # TODO: investigate integration test extreme flakiness on Xcode 15
+          - os: macos-12
+            xcode: Xcode_14.2
+          # - os: macos-13
+          #   xcode: Xcode_15.0.1
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
     runs-on: ${{ matrix.os }}