Storage integration tests: restructure to attempt to mitigate flakes (#…

…12268)
firebase · Jan 12, 2024 · 795c800 · 795c800
1 parent 7e21d23
commit 795c800
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
@@ -22,6 +22,7 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     strategy:
       matrix:
+        language: [Swift, ObjC]
         include:
           - os: macos-13
             xcode: Xcode_15.1
@@ -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
@@ -526,7 +526,7 @@ case "$product-$platform-$method" in
       test
     ;;
 
-  Storage-*-xcodebuild)
+  StorageSwift-*-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.