Skip to content

Merge updates from main branch into admob_2021 feature branch #743

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.

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

Merged
merged 48 commits into from
Nov 17, 2021

Conversation

jonsimantov
Copy link
Contributor

@jonsimantov jonsimantov commented Nov 10, 2021

Description

Provide details of the change, and generalize the change in the PR title above.

Merge from main into admob_2021 branch.

Doing this periodically should make it easier to merge the new admob_2021 branch into main later.

Note: This PR should probably NOT be squashed when merged into feature/admob_2021 - "Allow merge commits" will temporarily be enabled for the repo to merge this PR.


Testing

Describe how you've tested these changes. Link any manually triggered Integration tests or CPP binary SDK Packaging Github Action workflows, if applicable.

Running integration tests.


Type of Change

Place an x the applicable box:

  • Bug fix. Add the issue # below if applicable.
  • New feature. A non-breaking change which adds functionality.
  • Other, such as a build process or documentation change.

Notes

  • Bug fixes and feature changes require an update to the Release Notes section of release_build_files/readme.md.
  • Read the contribution guidelines CONTRIBUTING.md.
  • Changes to the public API require an internal API review. If you'd like to help us make Firebase APIs better, please propose your change in a feature request so that we can discuss it together.

ehsannas and others added 30 commits August 23, 2021 20:11
* operator== and operator!= for DocumentChange.

* delegate to underlying impl.

* Address comments.

* Update readme.

* Use ASSERT_EQ in a few more instances.

* rename third_change to change3.
* Add placeholder workflow for updating dependencies.
)

This workflow will:
- Check out the repo and create a branch
- Update the iOS and/or Android dependencies in that branch
- Push the branch to GitHub
- Create a PR on the branch
- Trigger integration tests to run on the PR (via label)

For now, to use, go to "Actions", select the "Update Android and iOS dependencies" workflow, and use workflow_dispatch to run the workflow. In most cases, the default inputs should be fine.
Was accidentally including both iOS and Android logs in both sections - this filters out the correct one for each section.
### Android

- com.google.firebase.firebase_database → 20.0.2
- com.google.firebase.firebase_functions → 20.0.1

### iOS

- Firebase/Analytics → 8.7.0
- Firebase/Auth → 8.7.0
- Firebase/Core → 8.7.0
- Firebase/Crashlytics → 8.7.0
- Firebase/Database → 8.7.0
- Firebase/DynamicLinks → 8.7.0
- Firebase/Firestore → 8.7.0
- Firebase/Functions → 8.7.0
- Firebase/Installations → 8.7.0
- Firebase/Messaging → 8.7.0
- Firebase/RemoteConfig → 8.7.0
- Firebase/Storage → 8.7.0

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

Co-authored-by: firebase-workflow-trigger-bot <[email protected]>
…ers. (#661)

The update-dependencies workflow can be triggered by other projects (e.g. firebase-ios-sdk once firebase/firebase-ios-sdk#8654 goes in). This adds an optional comment that will be included in the created PR, to make it clear what triggered the update.
* Fix the logic to generate .pro file

* update readme file

* modify the release notes

Co-authored-by: Cynthia Jiang <[email protected]>
* Fix the logic to generate .pro file

* update readme file

* modify the release notes

* Change the way to fetch initial token with the new API

* Change the way to fetch initial token with the new API

* Add change to release notes

Co-authored-by: Cynthia Jiang <[email protected]>
This enables cross-compiling for arm64 Mac. This changes the default Xcode version to 12.2, as Xcode 11 doesn't support arm64, and 12.0 fails with vcpkg. It'll still build with 11.7 in the expanded matrix and omit arm64.

Unit tests are built, but not run, on arm64. (They can't be run until GitHub has hosted ARM Mac runners, or we add our own.)

This PR adds a --arch option to the testapp builder but does not yet build for arm64 in the integration_tests workflow.

For packaged builds, we now build LLVM binutils on Mac, in addition to GNU binutils. LLVM binutils are required for the merge_libraries step on Mac, as GNU binutils does not support outputting ARM64 Mach-O files properly. (We still need GNU binutils on Mac for c++filt). Because LLVM binutils can take a long time to build, we cache it.
* Fix bug with logfile if --skip_android is set.
* Fix workflow to handle missing logfile.
### iOS

- Firebase/Analytics → 8.8.0
- Firebase/Auth → 8.8.0
- Firebase/Core → 8.8.0
- Firebase/Crashlytics → 8.8.0
- Firebase/Database → 8.8.0
- Firebase/DynamicLinks → 8.8.0
- Firebase/Firestore → 8.8.0
- Firebase/Functions → 8.8.0
- Firebase/Installations → 8.8.0
- Firebase/Messaging → 8.8.0
- Firebase/RemoteConfig → 8.8.0
- Firebase/Storage → 8.8.0

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

Co-authored-by: firebase-workflow-trigger-bot <[email protected]>
…ication_data_ if parsing the JSON body fails (#692)
[Triggered](https://github.com/firebase/firebase-android-sdk/actions/runs/1305537609) by [firebase-android-sdk Oct 04 release](firebase/firebase-android-sdk@7a48c9d).

  ### Android

- com.google.firebase.firebase_analytics → 19.0.2
- com.google.firebase.firebase_firestore → 23.0.4
- com.google.firebase.firebase_perf → 20.0.3

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

Co-authored-by: firebase-workflow-trigger-bot <[email protected]>
* Change Git tag of googletest to the 1.11.0 release.

This is already the version set in download_googletest.py, and is the
version that the integration tests have been built/tested with.

(Because the integration tests do some internal GoogleTest stuff, it's
risky to pin to the main branch.)

* Add comment explaining GoogleTest version.
@google-cla google-cla bot added the cla: no label Nov 10, 2021
@@ -603,6 +610,7 @@ TEST_F(FirebaseFirestoreBasicTest, TestRunTransaction) {
// TODO: Add test for failing transaction.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Lint warning: Missing username in TODO; it should look like "// TODO(my_username): Stuff."

@@ -665,6 +673,7 @@ TEST_F(FirebaseFirestoreBasicTest,
}

TEST_F(FirebaseFirestoreBasicTest, TestInvalidatingReferencesWhenDeletingApp) {
SKIP_TEST_ON_QUICK_CHECK;
delete shared_app_;
shared_app_ = nullptr;
// TODO: Ensure existing Firestore objects are invalidated.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Lint warning: Missing username in TODO; it should look like "// TODO(my_username): Stuff."

@jonsimantov jonsimantov added cla: yes tests-requested: quick Trigger a quick set of integration tests. labels Nov 10, 2021
@google-cla google-cla bot removed the cla: no label Nov 10, 2021
@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 Nov 10, 2021
@github-actions
Copy link

github-actions bot commented Nov 10, 2021

❌  Integration test FAILED

Requested by @DellaBitta on commit 8bbaf8b
Last updated: Wed Nov 17 08:28 PST 2021
View integration test log & download artifacts

Failures Configs
missing_log [TEST] [ERROR] [iOS] [macos] [simulator_target]
admob [TEST] [FAILURE] [Android] [ubuntu] [android_target]
(1 failed tests)  FirebaseAdMobTest.TestRewardedAdLoad
database [TEST] [FAILURE] [Android] [macos] [android_target]
(1 failed tests)  FirebaseDatabaseTest.TestInfoConnected
firestore [TEST] [ERROR] [Android] [windows, macos] [android_target]
functions [TEST] [ERROR] [Android] [windows, macos] [android_target]

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

@jonsimantov jonsimantov changed the title Feature/admob 2021 merge from main Merge updates from main branch into admob feature branch Nov 10, 2021
@jonsimantov jonsimantov changed the title Merge updates from main branch into admob feature branch Merge updates from main branch into admob_2021 feature branch Nov 10, 2021
@github-actions github-actions bot added the tests: failed This PR's integration tests failed. label Nov 10, 2021
@jonsimantov jonsimantov marked this pull request as draft November 10, 2021 23:05
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Nov 10, 2021
@github-actions github-actions bot added tests: in-progress This PR's integration tests are in progress. tests: failed This PR's integration tests failed. and removed tests: failed This PR's integration tests failed. labels Nov 11, 2021
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Nov 11, 2021
@jonsimantov
Copy link
Contributor Author

Looks like stuff is working now (except the admob flaky crash), PTAL.

@jonsimantov jonsimantov marked this pull request as ready for review November 12, 2021 19:19
@DellaBitta DellaBitta merged commit 8bbaf8b into feature/admob_2021 Nov 17, 2021
@DellaBitta DellaBitta deleted the feature/admob_2021_merge_from_main branch November 17, 2021 14:00
@github-actions github-actions bot added tests: in-progress This PR's integration tests are in progress. tests: failed This PR's integration tests failed. and removed tests: failed This PR's integration tests failed. labels Nov 17, 2021
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Nov 17, 2021
@firebase firebase locked and limited conversation to collaborators Dec 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla: yes tests: failed This PR's integration tests failed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.