Skip to content

Commit 919296c

Browse files
authored
[Infra] Remove 18.3.1 sim workaround (#15206)
1 parent e854f03 commit 919296c

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

scripts/build.sh

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -492,12 +492,11 @@ case "$product-$platform-$method" in
492492
../../../FirebaseRemoteConfig/Tests/Swift/AccessToken.json
493493

494494
# Integration tests are only run on iOS to minimize flake failures.
495-
# TODO(ncooke3): Remove -sdk and -destination flags and replace with "${xcb_flags[@]}"
496495
RunXcodebuild \
497496
-workspace 'gen/FirebaseRemoteConfig/FirebaseRemoteConfig.xcworkspace' \
498497
-scheme "FirebaseRemoteConfig-Unit-swift-api-tests" \
499-
-sdk 'iphonesimulator' \
500-
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.3.1' \
498+
"${ios_flags[@]}" \
499+
"${xcb_flags[@]}" \
501500
build \
502501
test
503502
;;
@@ -575,12 +574,10 @@ case "$product-$platform-$method" in
575574

576575
if check_secrets; then
577576
# Integration tests are only run on iOS to minimize flake failures.
578-
# TODO(ncooke3): Add back "${ios_flags[@]}". See #14657.
579577
RunXcodebuild \
580578
-workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
581579
-scheme "FirebaseStorage-Unit-integration" \
582-
-sdk 'iphonesimulator' \
583-
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.3.1' \
580+
"${ios_flags[@]}" \
584581
"${xcb_flags[@]}" \
585582
test
586583
fi
@@ -596,12 +593,10 @@ case "$product-$platform-$method" in
596593

597594
if check_secrets; then
598595
# Integration tests are only run on iOS to minimize flake failures.
599-
# TODO(ncooke3): Add back "${ios_flags[@]}". See #14657.
600596
RunXcodebuild \
601597
-workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
602598
-scheme "FirebaseStorage-Unit-ObjCIntegration" \
603-
-sdk 'iphonesimulator' \
604-
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.3.1' \
599+
"${ios_flags[@]}" \
605600
"${xcb_flags[@]}" \
606601
test
607602
fi
@@ -620,8 +615,8 @@ case "$product-$platform-$method" in
620615
RunXcodebuild \
621616
-workspace 'gen/FirebaseCombineSwift/FirebaseCombineSwift.xcworkspace' \
622617
-scheme "FirebaseCombineSwift-Unit-integration" \
623-
-sdk 'iphonesimulator' \
624-
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.3.1' \
618+
"${ios_flags[@]}" \
619+
"${xcb_flags[@]}" \
625620
test
626621
fi
627622
;;

0 commit comments

Comments
 (0)