Skip to content

Commit bf8a14d

Browse files
authored
[Infra] Use 18.3.1 simulator for Combine integration tests (#14798)
1 parent b51d06b commit bf8a14d

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/combine.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
name: combine
1616

17+
permissions:
18+
contents: read
19+
1720
on:
1821
workflow_dispatch:
1922
pull_request:
@@ -48,7 +51,7 @@ concurrency:
4851
jobs:
4952
xcodebuild:
5053
# Don't run on private repo unless it is a PR.
51-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
54+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || contains(fromJSON('["pull_request", "workflow_dispatch"]'), github.event_name)
5255
runs-on: macos-15
5356

5457
strategy:
@@ -74,7 +77,7 @@ jobs:
7477

7578
storage-combine-integration:
7679
# Don't run on private repo unless it is a PR.
77-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
80+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || contains(fromJSON('["pull_request", "workflow_dispatch"]'), github.event_name)
7881
env:
7982
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
8083
runs-on: macos-15

scripts/build.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,7 @@ case "$product-$platform-$method" in
327327
-workspace 'gen/FirebaseCombineSwift/FirebaseCombineSwift.xcworkspace' \
328328
-scheme "FirebaseCombineSwift-Unit-unit" \
329329
"${xcb_flags[@]}" \
330-
build \
331-
test
330+
build
332331
;;
333332

334333
# TODO(#14760): s/build/test after addressing UI test flakes on CI.
@@ -606,8 +605,8 @@ case "$product-$platform-$method" in
606605
RunXcodebuild \
607606
-workspace 'gen/FirebaseCombineSwift/FirebaseCombineSwift.xcworkspace' \
608607
-scheme "FirebaseCombineSwift-Unit-integration" \
609-
"${ios_flags[@]}" \
610-
"${xcb_flags[@]}" \
608+
-sdk 'iphonesimulator' \
609+
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.3.1' \
611610
test
612611
fi
613612
;;

0 commit comments

Comments
 (0)