fixes

firebase · Nov 3, 2023 · 3b65a94 · 3b65a94
1 parent 8f41237
commit 3b65a94
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml
@@ -49,7 +49,8 @@ jobs:
     #   run: FirebaseFunctions/Backend/start.sh synchronous
     - name: Build and test
       run: |
-        scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseFunctions.podspec  --test-specs=unit --platforms=${{ matrix.target }}
+        scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseFunctions.podspec \
+          --test-specs=unit --platforms=${{ matrix.target }}
 
   spm-integration:
     # Don't run on private repo unless it is a PR.

diff --git a/.github/workflows/installations.yml b/.github/workflows/installations.yml
@@ -29,8 +29,11 @@ jobs:
         include:
           - os: macos-12
             xcode: Xcode_14.2
+            test-specs: unit,integration
+          # Integration tests are flaky on Xcode 15
           - os: macos-13
             xcode: Xcode_15.0.1
+            test-specs: unit
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -53,7 +56,8 @@ jobs:
       run: |
        export FIS_INTEGRATION_TESTS_REQUIRED=${{ steps.secrets.outputs.val }}
        scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseInstallations.podspec \
-         --platforms=${{ matrix.target }}
+         --platforms=${{ matrix.target }} --test-specs=--platforms=${{ matrix.test-specs }}
+
   spm:
     # 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'

diff --git a/.github/workflows/remoteconfig.yml b/.github/workflows/remoteconfig.yml
@@ -65,8 +65,11 @@ jobs:
         include:
           - os: macos-12
             xcode: Xcode_14.2
+            tests:
+          # Flaky tests on CI
           - os: macos-13
             xcode: Xcode_15.0.1
+            tests: --skip-tests
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -77,7 +80,8 @@ jobs:
       run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
     - name: Build and test
       run: |
-       scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }}
+       scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }} \
+         ${{ matrix.tests }}
 
   spm:
     # Don't run on private repo unless it is a PR.