Restore disabled tests

firebase · Dec 26, 2023 · 39b61ab · 39b61ab
1 parent cd5b708
commit 39b61ab
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml
@@ -30,11 +30,10 @@ jobs:
         include:
           - os: macos-12
             xcode: Xcode_14.2
-            tests:
-          # Flaky tests on CI
+            tests: --skip-tests
           - os: macos-13
             xcode: Xcode_15.1
-            tests: --skip-tests
+            tests:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml
@@ -29,11 +29,10 @@ jobs:
         include:
           - os: macos-12
             xcode: Xcode_14.2
-            tests:
-          # Flaky tests on CI
+            tests: --skip-tests
           - os: macos-13
             xcode: Xcode_15.1
-            tests: --skip-tests
+            tests:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
@@ -31,10 +31,10 @@ jobs:
         include:
           - os: macos-12
             xcode: Xcode_14.2
-            tests: --test-specs=unit
+            tests: --skip-tests
           - os: macos-13
             xcode: Xcode_15.1
-            tests: --skip-tests
+            tests: --test-specs=unit
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml
@@ -29,9 +29,7 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-      # TODO: Investigate why PubSub integration tests fail with Xcode 15.0.1 on macos-13
-#    runs-on: macos-13
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v4
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -49,8 +47,8 @@ jobs:
         mkdir FirebaseMessaging/Tests/IntegrationTests/Resources
         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/messaging-sample-plist.gpg \
           FirebaseMessaging/Tests/IntegrationTests/Resources/GoogleService-Info.plist "$plist_secret"
-#    - name: Xcode
-#      run: sudo xcode-select -s /Applications/Xcode_15.1.app/Contents/Developer
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode_15.1.app/Contents/Developer
     - name: BuildAndTest
       run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/build.sh Messaging all)
 

diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
@@ -23,11 +23,10 @@ jobs:
     strategy:
       matrix:
         include:
-          # TODO: investigate integration test extreme flakiness on Xcode 15
           - os: macos-12
             xcode: Xcode_14.2
-          # - os: macos-13
-          #   xcode: Xcode_15.1
+         - os: macos-13
+           xcode: Xcode_15.1
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
     runs-on: ${{ matrix.os }}
@@ -176,10 +175,10 @@ jobs:
         include:
           - os: macos-12
             xcode: Xcode_14.2
-            tests: --test-specs=unit
+            tests: --skip-tests
           - os: macos-13
             xcode: Xcode_15.1
-            tests: --skip-tests
+            tests: --test-specs=unit
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4