tests(*): ci workflow tweaks

er2guotou · Sep 8, 2020 · cfd9a0e · cfd9a0e
2 parents a084641 + 566a374
commit cfd9a0e
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 16 deletions.
diff --git a/.github/workflows/firebase_analytics.yaml b/.github/workflows/firebase_analytics.yaml
@@ -34,7 +34,9 @@ jobs:
         with:
           api-level: 28
           arch: x86_64
-          target: google_apis
+          # Firebase Analytics works without Google Play Services, so we don't use the `googleapis`
+          # emulator target as it's considerably slower on CI.
+          target: default
           profile: Nexus 5X
           script: ./.github/workflows/scripts/drive-example.sh android
 

diff --git a/.github/workflows/firebase_core.yaml b/.github/workflows/firebase_core.yaml
@@ -34,7 +34,9 @@ jobs:
         with:
           api-level: 28
           arch: x86_64
-          target: google_apis
+          # Firebase Core works without Google Play Services, so we don't use the `googleapis`
+          # emulator target as it's considerably slower on CI.
+          target: default
           profile: Nexus 5X
           script: ./.github/workflows/scripts/drive-example.sh android
 

diff --git a/.github/workflows/firebase_crashlytics.yaml b/.github/workflows/firebase_crashlytics.yaml
@@ -35,7 +35,9 @@ jobs:
         with:
           api-level: 28
           arch: x86_64
-          target: google_apis
+          # Firebase Crashlytics works without Google Play Services, so we don't use the `googleapis`
+          # emulator target as it's considerably slower on CI.
+          target: default
           profile: Nexus 5X
           script: ./.github/workflows/scripts/drive-example.sh android
 

diff --git a/.github/workflows/firebase_database.yaml b/.github/workflows/firebase_database.yaml
@@ -35,7 +35,9 @@ jobs:
         with:
           api-level: 28
           arch: x86_64
-          target: google_apis
+          # Firebase Database works without Google Play Services, so we don't use the `googleapis`
+          # emulator target as it's considerably slower on CI.
+          target: default
           profile: Nexus 5X
           script: ./.github/workflows/scripts/drive-example.sh android
 

diff --git a/.github/workflows/firebase_firestore.yaml b/.github/workflows/firebase_firestore.yaml
@@ -39,7 +39,9 @@ jobs:
         with:
           api-level: 28
           arch: x86_64
-          target: google_apis
+          # Firebase Firestore works without Google Play Services, so we don't use the `googleapis`
+          # emulator target as it's considerably slower on CI.
+          target: default
           profile: Nexus 5X
           script: ./.github/workflows/scripts/drive-example.sh android
 
@@ -71,8 +73,9 @@ jobs:
         run: ./.github/workflows/scripts/drive-example.sh macos
 
   web:
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
+    # Using macos instead of ubuntu as Web app can't connect to Firebase Firestore emulator
+    # when running on ubuntu.
+    runs-on: macos-latest
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v1

diff --git a/.github/workflows/firebase_storage.yaml b/.github/workflows/firebase_storage.yaml
@@ -35,7 +35,9 @@ jobs:
         with:
           api-level: 28
           arch: x86_64
-          target: google_apis
+          # Firebase Storage works without Google Play Services, so we don't use the `googleapis`
+          # emulator target as it's considerably slower on CI.
+          target: default
           profile: Nexus 5X
           script: ./.github/workflows/scripts/drive-example.sh android
 

diff --git a/packages/cloud_firestore/cloud_firestore/example/test_driver/cloud_firestore_e2e.dart b/packages/cloud_firestore/cloud_firestore/example/test_driver/cloud_firestore_e2e.dart
@@ -2,27 +2,25 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:flutter/foundation.dart';
+import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:drive/drive.dart' as drive;
 import 'package:firebase_core/firebase_core.dart';
-import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import 'collection_reference_e2e.dart';
-import 'instance_e2e.dart';
-import 'query_e2e.dart';
-import 'document_reference_e2e.dart';
 import 'document_change_e2e.dart';
+import 'document_reference_e2e.dart';
 import 'field_value_e2e.dart';
 import 'geo_point_e2e.dart';
+import 'instance_e2e.dart';
+import 'query_e2e.dart';
 import 'snapshot_metadata_e2e.dart';
 import 'timestamp_e2e.dart';
 import 'transaction_e2e.dart';
 import 'write_batch_e2e.dart';
 
-// TODO(Salakar): Web can't connect to Firestore emulator in CI, unable to reproduce
-// connection issue locally (working fine locally and also for Android/iOS on CI).
-bool kUseFirestoreEmulator = !kIsWeb;
+bool kUseFirestoreEmulator = true;
 
 void testsMain() {
   setUpAll(() async {