Merge remote-tracking branch 'origin/dconeybe/SnappyPatchRevert' into TransactionOptions

Author: dconeybe

.github/workflows/android.yml

@@ -62,6 +62,10 @@ jobs:
           git config --global credential.helper 'store --file /tmp/git-credentials'
           echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials
 
+      - name: Enable Git Long-paths Support
+        if: runner.os == 'Windows'
+        run: git config --system core.longpaths true
+
       - name: Check expanded matrix config
         if: github.event.inputs.expanded_matrix == '1'
         run: |

.github/workflows/desktop.yml

@@ -101,6 +101,10 @@ jobs:
           git config --global credential.helper 'store --file /tmp/git-credentials'
           echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials
 
+      - name: Enable Git Long-paths Support
+        if: runner.os == 'Windows'
+        run: git config --system core.longpaths true
+
       - name: Setup Xcode version (macos)
         if: runner.os == 'macOS'
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version }}.app/Contents/Developer

.github/workflows/integration_tests.yml

@@ -277,6 +277,9 @@ jobs:
         run: |
           git config --global credential.helper 'store --file /tmp/git-credentials'
           echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials
+      - name: Enable Git Long-paths Support
+        if: runner.os == 'Windows'
+        run: git config --system core.longpaths true
       - name: Set env vars (Linux)
         if: startsWith(matrix.os, 'ubuntu')
         run: echo "VCPKG_TRIPLET=x64-linux" >> $GITHUB_ENV
@@ -471,6 +474,9 @@ jobs:
         run: |
           git config --global credential.helper 'store --file /tmp/git-credentials'
           echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials
+      - name: Enable Git Long-paths Support
+        if: runner.os == 'Windows'
+        run: git config --system core.longpaths true
       - name: Add msbuild to PATH (Windows)
         if: startsWith(matrix.os, 'windows')
         uses: microsoft/[email protected]

cmake/external/firestore.cmake

@@ -36,9 +36,10 @@ function(GetReleasedDep)
     firestore
 
     DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
-    # Pin to the HEAD commit of https://github.com/firebase/firebase-cpp-sdk/pull/932
+    # Pin to the HEAD commit of https://github.com/firebase/firebase-ios-sdk/pull/9838
+    # (Firestore TransactionOptions added, to specify maxAttempts)
     GIT_REPOSITORY https://github.com/firebase/firebase-ios-sdk.git
-    GIT_TAG 0fe625cf72254bfb8b0a899dd2c006836fafe475
+    GIT_TAG 141fdcb6c3b1efad19708f77ec88a5516c786d8b
 
     PREFIX ${PROJECT_BINARY_DIR}
 

firestore/integration_test_internal/src/bundle_test.cc

@@ -142,6 +142,9 @@ class BundleTest : public FirestoreIntegrationTest {
 };
 
 TEST_F(BundleTest, CanLoadBundlesWithoutProgressUpdates) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   Firestore* db = TestFirestore();
   auto bundle = CreateTestBundle(db);
 
@@ -152,6 +155,9 @@ TEST_F(BundleTest, CanLoadBundlesWithoutProgressUpdates) {
 }
 
 TEST_F(BundleTest, CanLoadBundlesWithProgressUpdates) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   Firestore* db = TestFirestore();
   auto bundle = CreateTestBundle(db);
 
@@ -180,6 +186,9 @@ TEST_F(BundleTest, CanLoadBundlesWithProgressUpdates) {
 }
 
 TEST_F(BundleTest, CanDeleteFirestoreFromProgressUpdate) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   Firestore* db = TestFirestore();
   auto bundle = CreateTestBundle(db);
 
@@ -216,6 +225,9 @@ TEST_F(BundleTest, CanDeleteFirestoreFromProgressUpdate) {
 }
 
 TEST_F(BundleTest, LoadBundlesForASecondTimeSkips) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   // TODO(wuandy): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -244,6 +256,9 @@ TEST_F(BundleTest, LoadBundlesForASecondTimeSkips) {
 }
 
 TEST_F(BundleTest, LoadInvalidBundlesShouldFail) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   // TODO(wuandy): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -273,6 +288,9 @@ TEST_F(BundleTest, LoadInvalidBundlesShouldFail) {
 }
 
 TEST_F(BundleTest, LoadBundleWithDocumentsAlreadyPulledFromBackend) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   // TODO(wuandy, b/189477267): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -319,6 +337,9 @@ TEST_F(BundleTest, LoadBundleWithDocumentsAlreadyPulledFromBackend) {
 }
 
 TEST_F(BundleTest, LoadedDocumentsShouldNotBeGarbageCollectedRightAway) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   // TODO(wuandy, b/189477267): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -343,6 +364,9 @@ TEST_F(BundleTest, LoadedDocumentsShouldNotBeGarbageCollectedRightAway) {
 }
 
 TEST_F(BundleTest, LoadDocumentsFromOtherProjectsShouldFail) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   Firestore* db = TestFirestore();
   auto bundle = CreateBundle("other-project");
   std::vector<LoadBundleTaskProgress> progresses;
@@ -363,6 +387,9 @@ TEST_F(BundleTest, LoadDocumentsFromOtherProjectsShouldFail) {
 }
 
 TEST_F(BundleTest, GetInvalidNamedQuery) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   Firestore* db = TestFirestore();
   {
     auto future = db->NamedQuery("DOES_NOT_EXIST");