From d91c3905eb86e2a0108a3577f439afb3e3b512b8 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Tue, 10 May 2022 18:52:49 +0000 Subject: [PATCH 1/5] firestore.cmake: point at HEAD commit in master branch: https://github.com/firebase/firebase-ios-sdk/commit/c4c3d2f33c44c5fab79e4008ae086fa5bc7c0028 --- cmake/external/firestore.cmake | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake index 7cb97c0ce9..ea96e6fb57 100644 --- a/cmake/external/firestore.cmake +++ b/cmake/external/firestore.cmake @@ -18,17 +18,13 @@ if(TARGET firestore) return() endif() -# If the format of the line below changes, then be sure to update -# https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81 -set(version CocoaPods-9.0.0) - function(GetReleasedDep) - message("Getting released firebase-ios-sdk @ ${version}") ExternalProject_Add( firestore DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR} - URL https://github.com/firebase/firebase-ios-sdk/archive/${version}.tar.gz + GIT_REPOSITORY "https://github.com/firebase/firebase-ios-sdk.git" + GIT_TAG c4c3d2f33c44c5fab79e4008ae086fa5bc7c0028 PREFIX ${PROJECT_BINARY_DIR} From 1b9beed6d50d1138217ed707d04f5b333b44d796 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 11 May 2022 04:35:52 +0000 Subject: [PATCH 2/5] CMakeLists.txt: set(RE2_BUILD_TESTING OFF CACHE BOOL "") --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index cb610fdc90..83b2a3fde5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,6 +214,9 @@ endif() # firebase-ios-sdk since it's not needed and can sometimes fail to build. set(FIRESTORE_INCLUDE_OBJC OFF CACHE BOOL "Disabled for the CPP SDK") +# Disable re2 build tests +set(RE2_BUILD_TESTING OFF CACHE BOOL "") + if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD) # Quote meta characters in ${CMAKE_CURRENT_LIST_DIR} so we can # match it in a regex. From 7343ab51f7f4fba9f6ad5de5299e9a1407cf1679 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 11 May 2022 14:03:27 +0000 Subject: [PATCH 3/5] lambda_event_listener.h: change path to firestore_errors.h include to see if it fixes build errors in CI: lambda_event_listener.h:23:10: fatal error: 'firebase/firestore/firestore_errors.h' file not found --- firestore/src/android/lambda_event_listener.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firestore/src/android/lambda_event_listener.h b/firestore/src/android/lambda_event_listener.h index 5cb6d994f5..dd5d64ac7d 100644 --- a/firestore/src/android/lambda_event_listener.h +++ b/firestore/src/android/lambda_event_listener.h @@ -20,7 +20,7 @@ #include #include "app/meta/move.h" -#include "firebase/firestore/firestore_errors.h" +#include "Firestore/core/include/firebase/firestore/firestore_errors.h" #include "firestore/src/common/event_listener.h" namespace firebase { From 541047fa33096273fde5ab8aa50ab9f30fa653ad Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 11 May 2022 14:10:21 +0000 Subject: [PATCH 4/5] build_scripts/android/build.sh: reduce retries from 10 to 1, so CI doesn't take as long --- build_scripts/android/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_scripts/android/build.sh b/build_scripts/android/build.sh index 16e4d456ab..0632b5ebc7 100755 --- a/build_scripts/android/build.sh +++ b/build_scripts/android/build.sh @@ -44,7 +44,7 @@ set +e # network connectivity issues that cause the download to fail. gradleparams="-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false\ -Dmaven.wagon.httpconnectionManager.ttlSeconds=120" -for retry in {1..10} error; do +for retry in {1..1} error; do if [[ $retry == "error" ]]; then exit 5; fi ./gradlew assembleRelease "${gradleparams}" && break sleep 300 From 2e79f977d9c202cf0188df2e4b67b2dcaa43aa2b Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 11 May 2022 14:56:42 +0000 Subject: [PATCH 5/5] Revert "lambda_event_listener.h: change path to firestore_errors.h include to see if it fixes build errors in CI: lambda_event_listener.h:23:10: fatal error: 'firebase/firestore/firestore_errors.h' file not found" This change didn't fix anything. This reverts commit 7343ab51f7f4fba9f6ad5de5299e9a1407cf1679. --- firestore/src/android/lambda_event_listener.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firestore/src/android/lambda_event_listener.h b/firestore/src/android/lambda_event_listener.h index dd5d64ac7d..5cb6d994f5 100644 --- a/firestore/src/android/lambda_event_listener.h +++ b/firestore/src/android/lambda_event_listener.h @@ -20,7 +20,7 @@ #include #include "app/meta/move.h" -#include "Firestore/core/include/firebase/firestore/firestore_errors.h" +#include "firebase/firestore/firestore_errors.h" #include "firestore/src/common/event_listener.h" namespace firebase {