Skip to content

Commit 795c800

Browse files
authored
Storage integration tests: restructure to attempt to mitigate flakes (#12268)
1 parent 7e21d23 commit 795c800

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.github/workflows/storage.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
2323
strategy:
2424
matrix:
25+
language: [Swift, ObjC]
2526
include:
2627
- os: macos-13
2728
xcode: Xcode_15.1
@@ -51,7 +52,7 @@ jobs:
5152
- name: Xcode
5253
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
5354
- name: BuildAndTest # can be replaced with pod lib lint with CocoaPods 1.10
54-
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/build.sh Storage all)
55+
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/build.sh Storage${{ matrix.language }} all)
5556

5657
spm:
5758
# Don't run on private repo unless it is a PR.

scripts/build.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ case "$product-$platform-$method" in
526526
test
527527
;;
528528

529-
Storage-*-xcodebuild)
529+
StorageSwift-*-xcodebuild)
530530
pod_gen FirebaseStorage.podspec --platforms=ios
531531

532532
# Add GoogleService-Info.plist to generated Test Wrapper App.
@@ -543,6 +543,15 @@ case "$product-$platform-$method" in
543543
"${xcb_flags[@]}" \
544544
test
545545
fi
546+
;;
547+
548+
StorageObjC-*-xcodebuild)
549+
pod_gen FirebaseStorage.podspec --platforms=ios
550+
551+
# Add GoogleService-Info.plist to generated Test Wrapper App.
552+
ruby ./scripts/update_xcode_target.rb gen/FirebaseStorage/Pods/Pods.xcodeproj \
553+
AppHost-FirebaseStorage-Unit-Tests \
554+
../../../FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist
546555

547556
if check_secrets; then
548557
# Integration tests are only run on iOS to minimize flake failures.

0 commit comments

Comments
 (0)