Skip to content

Commit 387de5b

Browse files
authored
[Infra] Enable testing for iOS 13+ client app scheme (#11987)
1 parent 5661bab commit 387de5b

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.github/workflows/client_app.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,22 @@ jobs:
3030
matrix:
3131
#TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
3232
platform: [iOS]
33+
scheme: [ClientApp, ClientApp-iOS13]
3334
steps:
3435
- uses: actions/checkout@v3
3536
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
3637
with:
3738
cache_key: ${{ matrix.os }}
3839
- name: Build Client App –– ${{ matrix.platform }}
39-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh SwiftPMClientApp ${{ matrix.platform }} xcodebuild
40+
run: scripts/third_party/travis/retry.sh ./scripts/build.sh ${{ matrix.scheme }} ${{ matrix.platform }} xcodebuild
4041

4142
client-app-cocoapods:
4243
# Don't run on private repo unless it is a PR.
4344
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
4445
runs-on: macos-12
46+
strategy:
47+
matrix:
48+
scheme: [ClientApp-CocoaPods, ClientApp-CocoaPods-iOS13]
4549
steps:
4650
- uses: actions/checkout@v3
4751
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -53,4 +57,4 @@ jobs:
5357
- name: Prereqs
5458
run: scripts/install_prereqs.sh ClientApp iOS xcodebuild
5559
- name: Build
56-
run: scripts/build.sh CocoaPodsClientApp iOS xcodebuild
60+
run: scripts/build.sh ${{ matrix.scheme }} iOS xcodebuild

scripts/build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -698,18 +698,18 @@ case "$product-$platform-$method" in
698698
build
699699
;;
700700

701-
SwiftPMClientApp-*-xcodebuild)
701+
ClientApp-iOS-xcodebuild | ClientApp-iOS13-iOS-xcodebuild)
702702
RunXcodebuild \
703703
-project 'ClientApp/ClientApp.xcodeproj' \
704-
-scheme "ClientApp" \
704+
-scheme $product \
705705
"${xcb_flags[@]}" \
706706
build
707707
;;
708708

709-
CocoaPodsClientApp-iOS-xcodebuild)
709+
ClientApp-CocoaPods*-iOS-xcodebuild)
710710
RunXcodebuild \
711711
-workspace 'ClientApp/ClientApp.xcworkspace' \
712-
-scheme "ClientApp-CocoaPods" \
712+
-scheme $product \
713713
"${xcb_flags[@]}" \
714714
build
715715
;;

0 commit comments

Comments
 (0)