Skip to content

Commit 5bca20c

Browse files
authored
[Infra] Remove 18.3.1 sim workaround
1 parent e854f03 commit 5bca20c

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

scripts/build.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -496,8 +496,8 @@ case "$product-$platform-$method" in
496496
RunXcodebuild \
497497
-workspace 'gen/FirebaseRemoteConfig/FirebaseRemoteConfig.xcworkspace' \
498498
-scheme "FirebaseRemoteConfig-Unit-swift-api-tests" \
499-
-sdk 'iphonesimulator' \
500-
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.3.1' \
499+
"${ios_flags[@]}" \
500+
"${xcb_flags[@]}" \
501501
build \
502502
test
503503
;;
@@ -575,12 +575,10 @@ case "$product-$platform-$method" in
575575

576576
if check_secrets; then
577577
# Integration tests are only run on iOS to minimize flake failures.
578-
# TODO(ncooke3): Add back "${ios_flags[@]}". See #14657.
579578
RunXcodebuild \
580579
-workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
581580
-scheme "FirebaseStorage-Unit-integration" \
582-
-sdk 'iphonesimulator' \
583-
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.3.1' \
581+
"${ios_flags[@]}" \
584582
"${xcb_flags[@]}" \
585583
test
586584
fi
@@ -596,12 +594,10 @@ case "$product-$platform-$method" in
596594

597595
if check_secrets; then
598596
# Integration tests are only run on iOS to minimize flake failures.
599-
# TODO(ncooke3): Add back "${ios_flags[@]}". See #14657.
600597
RunXcodebuild \
601598
-workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
602599
-scheme "FirebaseStorage-Unit-ObjCIntegration" \
603-
-sdk 'iphonesimulator' \
604-
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.3.1' \
600+
"${ios_flags[@]}" \
605601
"${xcb_flags[@]}" \
606602
test
607603
fi
@@ -620,8 +616,8 @@ case "$product-$platform-$method" in
620616
RunXcodebuild \
621617
-workspace 'gen/FirebaseCombineSwift/FirebaseCombineSwift.xcworkspace' \
622618
-scheme "FirebaseCombineSwift-Unit-integration" \
623-
-sdk 'iphonesimulator' \
624-
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.3.1' \
619+
"${ios_flags[@]}" \
620+
"${xcb_flags[@]}" \
625621
test
626622
fi
627623
;;

0 commit comments

Comments
 (0)