Skip to content

Revert "OR Query Implementation (#1335)" #1399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 28, 2023
Merged

Revert "OR Query Implementation (#1335)" #1399

merged 1 commit into from
Jul 28, 2023

Conversation

@tom-andersen
Copy link
Contributor

@tom-andersen tom-andersen commented Jul 21, 2023 •
edited by dconeybe
Loading

This reverts #1335 due to the Android crashes that cannot be fixed without a corresponding fix in the Android SDK.

@tom-andersen tom-andersen requested a review from dconeybe July 21, 2023 18:13
@dconeybe dconeybe added the tests-requested: quick Trigger a quick set of integration tests. label Jul 21, 2023
@github-actions github-actions bot added tests: in-progress This PR's integration tests are in progress. and removed tests-requested: quick Trigger a quick set of integration tests. labels Jul 21, 2023
@dconeybe
Copy link
Contributor

dconeybe commented Jul 21, 2023

I'm withholding my approval until we determine that something less sledgehammer-ish won't work, such as forward-fixing or disabling the problematic tests.

@github-actions
Copy link

github-actions bot commented Jul 21, 2023 •
edited
Loading

Integration test with FLAKINESS (succeeded after retry)

Requested by @tom-andersen on commit daf92c8
Last updated: Fri Jul 28 14:04 PDT 2023
View integration test log & download artifacts

Failures Configs
app_check [TEST] [FLAKINESS] [Android] [1/3 os: ubuntu] [1/2 android_device: android_target]
(1 failed tests)  FirebaseAppCheckTest.TestDebugProviderValidToken
database [TEST] [FLAKINESS] [Android] [1/3 os: macos] [1/2 android_device: android_target]
(1 failed tests)  CRASH/TIMEOUT
gma [TEST] [FLAKINESS] [Android] [1/3 os: windows] [1/2 android_device: android_target]
(1 failed tests)  CRASH/TIMEOUT
remote_config [TEST] [FLAKINESS] [Android] [1/3 os: ubuntu] [1/2 android_device: android_target]
(1 failed tests)  FirebaseRemoteConfigTest.TestAddOnConfigUpdateListener
[TEST] [FLAKINESS] [Android] [1/3 os: ubuntu] [1/2 android_device: emulator_ftl_target]
(2 failed tests)  FirebaseRemoteConfigTest.TestFetchInterval
  FirebaseRemoteConfigTest.TestFetchSecondsParameter

Add flaky tests to go/fpl-cpp-flake-tracker

@github-actions github-actions bot added the tests: succeeded This PR's integration tests succeeded. label Jul 21, 2023
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Jul 21, 2023
@dconeybe dconeybe assigned tom-andersen and unassigned dconeybe Jul 28, 2023
@tom-andersen tom-andersen merged commit daf92c8 into main Jul 28, 2023
@github-actions github-actions bot added tests: in-progress This PR's integration tests are in progress. tests: succeeded This PR's integration tests succeeded. and removed tests: succeeded This PR's integration tests succeeded. labels Jul 28, 2023
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Jul 28, 2023
jonsimantov added a commit that referenced this pull request Jul 31, 2023
@firebase-workflow-trigger @jonsimantov
@tom-andersen @AlmostMatt
Automatic merge of main into feature_branch/ump-sdk - Jul 31, 2023 (#…
9b8e34e 
…1407)

* iOS: Remove Analytics dependency from GMA integration test (#1386)

* Try using CoreOnly instead of Analytics cocoapod for tests.

* Update readme.

* Add stub workflow for updating feature branches.

* Add script to merge main into all active feature branches on a regular schedule. (#1394)

* Add workflow for automatically updating feature branches weekly.

* Corrected filename, and added inputs.

* Remove trailing spaces.

* Fix workflow.

* Fix workflow name.

* Fix syntax.

* Fix syntax.

* List remote branches instead.

* Clean up script.

* Untab.

* Add branch list for debugging.

* Untab.

* Specify remote branches.

* Skip second stage if no first.

* Typo

* Error.

* List all branches.

* Fix logic.

* Fix spacing.

* Fix output

* Fix parameters.

* Fix merge to use origin.

* Remove debug echos.

* Add git config.

* Fix PR creation.

* Fix PR creation.

* Fix automatic push.

* Increase retry. (#1402)

* Add Firestore test history report (#1403)

* Add --firestore flag to report Firestore history.

* Add Firestore report to nightly cron job.

* Remove multiline commands.

* Revert "Remove multiline commands."

This reverts commit 6393ae9.

* Fix tabbing.

* Fix packaging test detection for Firestore.

* Revert "OR Query Implementation (#1335)" (#1399)

This reverts commit 11332d4.

* Wrap the real-time RemoteConfig test in flaky-block to automatically retry. (#1406)

* Only use flaky_test on android

---------

Co-authored-by: Jon Simantov <[email protected]>
Co-authored-by: Tom Andersen <[email protected]>
Co-authored-by: Matthew Hyndman <[email protected]>
jonsimantov added a commit that referenced this pull request Aug 7, 2023
@firebase-workflow-trigger @jonsimantov
@tom-andersen @AlmostMatt @a-maurice @compnerd @cynthiajoan
Automatic merge of main into feature_branch/ump-sdk - Aug 07, 2023 (#…
64369f4 
…1419)

* iOS: Remove Analytics dependency from GMA integration test (#1386)

* Try using CoreOnly instead of Analytics cocoapod for tests.

* Update readme.

* Add stub workflow for updating feature branches.

* Add script to merge main into all active feature branches on a regular schedule. (#1394)

* Add workflow for automatically updating feature branches weekly.

* Corrected filename, and added inputs.

* Remove trailing spaces.

* Fix workflow.

* Fix workflow name.

* Fix syntax.

* Fix syntax.

* List remote branches instead.

* Clean up script.

* Untab.

* Add branch list for debugging.

* Untab.

* Specify remote branches.

* Skip second stage if no first.

* Typo

* Error.

* List all branches.

* Fix logic.

* Fix spacing.

* Fix output

* Fix parameters.

* Fix merge to use origin.

* Remove debug echos.

* Add git config.

* Fix PR creation.

* Fix PR creation.

* Fix automatic push.

* Increase retry. (#1402)

* Add Firestore test history report (#1403)

* Add --firestore flag to report Firestore history.

* Add Firestore report to nightly cron job.

* Remove multiline commands.

* Revert "Remove multiline commands."

This reverts commit 6393ae9.

* Fix tabbing.

* Fix packaging test detection for Firestore.

* Revert "OR Query Implementation (#1335)" (#1399)

This reverts commit 11332d4.

* Wrap the real-time RemoteConfig test in flaky-block to automatically retry. (#1406)

* Only use flaky_test on android

* Update the iOS version used by FTL (#1408)

* Kick off nightly packaging an hour earlier (#1409)

* Fix crash on gma::Initialize without a Firebase App (#1320)

Initialize Util before using Util::FIndClass. Also add an integration test for initializing gma without a firebase app.

* build: pass along the CMake path (#1410)

When building the subproject, we would invoke `cmake` directly, relying on the path lookup of the tool, which may or may not match the currently executing CMake.  Use `CMAKE_COMMAND` which gives us the path to the current CMake executable ensuring that we use the same CMake for building the dependencies.

* Add log to gsutil fetch. (#1411)

* Update mobile dependencies - Thu Aug 03 2023 (#1413)

* Update mobile dependencies - Thu Aug 03 2023

### Android

- com.google.firebase.firebase_bom → 32.2.2

### iOS

- Firebase/Analytics → 10.13.0
- Firebase/AppCheck → 10.13.0
- Firebase/Auth → 10.13.0
- Firebase/Core → 10.13.0
- Firebase/CoreOnly → 10.13.0
- Firebase/Crashlytics → 10.13.0
- Firebase/Database → 10.13.0
- Firebase/DynamicLinks → 10.13.0
- Firebase/Firestore → 10.13.0
- Firebase/Functions → 10.13.0
- Firebase/Installations → 10.13.0
- Firebase/Messaging → 10.13.0
- Firebase/RemoteConfig → 10.13.0
- Firebase/Storage → 10.13.0
- Google-Mobile-Ads-SDK → 10.9.0

> Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/5755777170).

* Ensure using a Swift bridging header that supports both arm64 and x86_64.

* Add release note about i386 no longer being supported.

* Remove armv7 as well.

---------

Co-authored-by: firebase-workflow-trigger-bot <[email protected]>
Co-authored-by: Jon Simantov <[email protected]>
Co-authored-by: [email protected] <[email protected]>

* feat(auth): Add emulator support (#1400)

* add auth emulator support

* fix ios number parse

* update the documentation part

* reduce lint warning

* more lint warnings

* code format

* use environment to decide using emulator or not

* fix a typo

* add readme entry for FirebaseApp.GetApps()

* update for review comment

* add missing `

---------

Co-authored-by: Cynthia Jiang <[email protected]>

---------

Co-authored-by: Jon Simantov <[email protected]>
Co-authored-by: Tom Andersen <[email protected]>
Co-authored-by: Matthew Hyndman <[email protected]>
Co-authored-by: a-maurice <[email protected]>
Co-authored-by: Saleem Abdulrasool <[email protected]>
Co-authored-by: firebase-workflow-trigger[bot] <80733318+firebase-workflow-trigger[bot]@users.noreply.github.com>
Co-authored-by: firebase-workflow-trigger-bot <[email protected]>
Co-authored-by: Cynthia J <[email protected]>
Co-authored-by: Cynthia Jiang <[email protected]>
jonsimantov added a commit that referenced this pull request Aug 15, 2023
@firebase-workflow-trigger @jonsimantov
@tom-andersen @AlmostMatt @a-maurice @compnerd @cynthiajoan @nakirekommula
Automatic merge of main into feature_branch/ump-sdk - Aug 14, 2023 (#…
2c253aa 
…1425)

* iOS: Remove Analytics dependency from GMA integration test (#1386)

* Try using CoreOnly instead of Analytics cocoapod for tests.

* Update readme.

* Add stub workflow for updating feature branches.

* Add script to merge main into all active feature branches on a regular schedule. (#1394)

* Add workflow for automatically updating feature branches weekly.

* Corrected filename, and added inputs.

* Remove trailing spaces.

* Fix workflow.

* Fix workflow name.

* Fix syntax.

* Fix syntax.

* List remote branches instead.

* Clean up script.

* Untab.

* Add branch list for debugging.

* Untab.

* Specify remote branches.

* Skip second stage if no first.

* Typo

* Error.

* List all branches.

* Fix logic.

* Fix spacing.

* Fix output

* Fix parameters.

* Fix merge to use origin.

* Remove debug echos.

* Add git config.

* Fix PR creation.

* Fix PR creation.

* Fix automatic push.

* Increase retry. (#1402)

* Add Firestore test history report (#1403)

* Add --firestore flag to report Firestore history.

* Add Firestore report to nightly cron job.

* Remove multiline commands.

* Revert "Remove multiline commands."

This reverts commit 6393ae9.

* Fix tabbing.

* Fix packaging test detection for Firestore.

* Revert "OR Query Implementation (#1335)" (#1399)

This reverts commit 11332d4.

* Wrap the real-time RemoteConfig test in flaky-block to automatically retry. (#1406)

* Only use flaky_test on android

* Update the iOS version used by FTL (#1408)

* Kick off nightly packaging an hour earlier (#1409)

* Fix crash on gma::Initialize without a Firebase App (#1320)

Initialize Util before using Util::FIndClass. Also add an integration test for initializing gma without a firebase app.

* build: pass along the CMake path (#1410)

When building the subproject, we would invoke `cmake` directly, relying on the path lookup of the tool, which may or may not match the currently executing CMake.  Use `CMAKE_COMMAND` which gives us the path to the current CMake executable ensuring that we use the same CMake for building the dependencies.

* Add log to gsutil fetch. (#1411)

* Update mobile dependencies - Thu Aug 03 2023 (#1413)

* Update mobile dependencies - Thu Aug 03 2023

### Android

- com.google.firebase.firebase_bom → 32.2.2

### iOS

- Firebase/Analytics → 10.13.0
- Firebase/AppCheck → 10.13.0
- Firebase/Auth → 10.13.0
- Firebase/Core → 10.13.0
- Firebase/CoreOnly → 10.13.0
- Firebase/Crashlytics → 10.13.0
- Firebase/Database → 10.13.0
- Firebase/DynamicLinks → 10.13.0
- Firebase/Firestore → 10.13.0
- Firebase/Functions → 10.13.0
- Firebase/Installations → 10.13.0
- Firebase/Messaging → 10.13.0
- Firebase/RemoteConfig → 10.13.0
- Firebase/Storage → 10.13.0
- Google-Mobile-Ads-SDK → 10.9.0

> Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/5755777170).

* Ensure using a Swift bridging header that supports both arm64 and x86_64.

* Add release note about i386 no longer being supported.

* Remove armv7 as well.

---------

Co-authored-by: firebase-workflow-trigger-bot <[email protected]>
Co-authored-by: Jon Simantov <[email protected]>
Co-authored-by: [email protected] <[email protected]>

* feat(auth): Add emulator support (#1400)

* add auth emulator support

* fix ios number parse

* update the documentation part

* reduce lint warning

* more lint warnings

* code format

* use environment to decide using emulator or not

* fix a typo

* add readme entry for FirebaseApp.GetApps()

* update for review comment

* add missing `

---------

Co-authored-by: Cynthia Jiang <[email protected]>

* Update merge-to-main script (#1420)

* Before creating the merge-main PR, branch it off main, so merge conflicts can be addressed in the branch rather than by committing to main.

* Format.

* Update release version number for M135, 11.4.0 (#1421)

* feat(auth): enable emulator support on desktop (#1423)

* add auth emulator support

* fix ios number parse

* update the documentation part

* reduce lint warning

* more lint warnings

* code format

* use environment to decide using emulator or not

* fix a typo

* add readme entry for FirebaseApp.GetApps()

* update for review comment

* add missing `

* make json request always do restrict json

* add readme info

* prepare for review

* some minor tweak

* code format

* update review comments

* update the unit test after request json change

---------

Co-authored-by: Cynthia Jiang <[email protected]>

* Internal Updates. (#1422)

* Add logic to trim webp parameter from native image urls

---------

Co-authored-by: Jon Simantov <[email protected]>
Co-authored-by: Tom Andersen <[email protected]>
Co-authored-by: Matthew Hyndman <[email protected]>
Co-authored-by: a-maurice <[email protected]>
Co-authored-by: Saleem Abdulrasool <[email protected]>
Co-authored-by: firebase-workflow-trigger[bot] <80733318+firebase-workflow-trigger[bot]@users.noreply.github.com>
Co-authored-by: firebase-workflow-trigger-bot <[email protected]>
Co-authored-by: Cynthia J <[email protected]>
Co-authored-by: Cynthia Jiang <[email protected]>
Co-authored-by: nakirekommula <[email protected]>
@firebase firebase locked and limited conversation to collaborators Aug 28, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@dconeybe dconeybe dconeybe approved these changes

Assignees

@tom-andersen tom-andersen

Labels

tests: succeeded This PR's integration tests succeeded.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@tom-andersen @dconeybe