From 3c5afb09b5a3785f7691943303aaa9eb48237163 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Fri, 12 Jan 2024 08:58:28 -0800
Subject: [PATCH] Try splitting ObjC and Swift to different jobs

---
 .github/workflows/storage.yml |  7 ++++---
 scripts/build.sh              | 11 ++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
index d184ede9ae3..82512dea885 100644
--- a/.github/workflows/storage.yml
+++ b/.github/workflows/storage.yml
@@ -23,8 +23,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
+          - os: macos-13
+            xcode: Xcode_15.1
+            language: [Swift, ObjC]
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
     runs-on: ${{ matrix.os }}
@@ -51,7 +52,7 @@ jobs:
     - name: Xcode
       run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.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 Storage all)
+      run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/build.sh Storage${{ matrix.language }} all)
 
   spm:
     # Don't run on private repo unless it is a PR.
diff --git a/scripts/build.sh b/scripts/build.sh
index 3ea1fcd492e..dca21686b3a 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -526,7 +526,7 @@ case "$product-$platform-$method" in
       test
     ;;
 
-  Storage-*-xcodebuild)
+  StoragSwift-*-xcodebuild)
     pod_gen FirebaseStorage.podspec --platforms=ios
 
     # Add GoogleService-Info.plist to generated Test Wrapper App.
@@ -543,6 +543,15 @@ case "$product-$platform-$method" in
         "${xcb_flags[@]}" \
         test
     fi
+    ;;
+
+  StorageObjC-*-xcodebuild)
+    pod_gen FirebaseStorage.podspec --platforms=ios
+
+    # Add GoogleService-Info.plist to generated Test Wrapper App.
+    ruby ./scripts/update_xcode_target.rb gen/FirebaseStorage/Pods/Pods.xcodeproj \
+      AppHost-FirebaseStorage-Unit-Tests \
+      ../../../FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist
 
     if check_secrets; then
       # Integration tests are only run on iOS to minimize flake failures.