[Infra] Enable testing for iOS 13+ client app scheme (#11987)

firebase · Oct 24, 2023 · 387de5b · 387de5b
1 parent 5661bab
commit 387de5b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/client_app.yml b/.github/workflows/client_app.yml
@@ -30,18 +30,22 @@ jobs:
       matrix:
         #TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
         platform: [iOS]
+        scheme: [ClientApp, ClientApp-iOS13]
     steps:
       - uses: actions/checkout@v3
       - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
         with:
           cache_key: ${{ matrix.os }}
       - name: Build Client App –– ${{ matrix.platform }}
-        run: scripts/third_party/travis/retry.sh ./scripts/build.sh SwiftPMClientApp ${{ matrix.platform }} xcodebuild
+        run: scripts/third_party/travis/retry.sh ./scripts/build.sh ${{ matrix.scheme }} ${{ matrix.platform }} xcodebuild
 
   client-app-cocoapods:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     runs-on: macos-12
+    strategy:
+      matrix:
+        scheme: [ClientApp-CocoaPods, ClientApp-CocoaPods-iOS13]
     steps:
       - uses: actions/checkout@v3
       - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -53,4 +57,4 @@ jobs:
       - name: Prereqs
         run: scripts/install_prereqs.sh ClientApp iOS xcodebuild
       - name: Build
-        run: scripts/build.sh CocoaPodsClientApp iOS xcodebuild
+        run: scripts/build.sh ${{ matrix.scheme }} iOS xcodebuild
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -698,18 +698,18 @@ case "$product-$platform-$method" in
       build
     ;;
 
-  SwiftPMClientApp-*-xcodebuild)
+  ClientApp-iOS-xcodebuild | ClientApp-iOS13-iOS-xcodebuild)
     RunXcodebuild \
       -project 'ClientApp/ClientApp.xcodeproj' \
-      -scheme "ClientApp" \
+      -scheme $product \
       "${xcb_flags[@]}" \
       build
     ;;
 
-  CocoaPodsClientApp-iOS-xcodebuild)
+  ClientApp-CocoaPods*-iOS-xcodebuild)
     RunXcodebuild \
       -workspace 'ClientApp/ClientApp.xcworkspace' \
-      -scheme "ClientApp-CocoaPods" \
+      -scheme $product \
       "${xcb_flags[@]}" \
       build
     ;;