Skip to content
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

[Android] Fix for settings migration (uplift to 1.19.x) #7588

Merged
merged 1 commit into from
Jan 14, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jan 13, 2021

Uplift of #7575
Resolves brave/brave-browser#13522

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds requested a review from a team January 13, 2021 21:15
@brave-builds brave-builds self-assigned this Jan 13, 2021
@brave-builds brave-builds added this to the 1.19.x - Beta milestone Jan 13, 2021
@kjozwiak
Copy link
Member

Win failed test-browser due to several reward failures as per https://ci.brave.com/job/pr-brave-browser-pr7575_android_settings_migration_fix_1.19.x-windows/1/execution/node/214/log/. However, these are known intermittent issues as per brave/brave-browser#12987, brave/brave-browser#12607, brave/brave-browser#12704, brave/brave-browser#12985, brave/brave-browser#12607, brave/brave-browser#12605 & brave/brave-browser#12632.

18:48:54  7 tests failed:
18:48:54      RewardsBrowserTest.BackupRestoreModalHasNotice (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:304)
18:48:54      RewardsBrowserTest.ResetRewardsWithBAT (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:375)
18:48:54      RewardsBrowserTest.UpholdLimitNoBAT (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:398)
18:48:54      RewardsContributionBrowserTest.TipConnectedPublisherVerified (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:586)
18:48:54      RewardsContributionBrowserTest.TipUnverifiedPublisher (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:304)
18:48:54      RewardsPromotionBrowserTest.ClaimViaSettingsPage (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:196)
18:48:54      RewardsPromotionBrowserTest.PromotionRemovedFromEndpoint (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:231)

Restarting macOS as it seems like it was interrupted as per https://ci.brave.com/job/pr-brave-browser-pr7575_android_settings_migration_fix_1.19.x-macos/1/execution/node/186/log/.

20:24:27  Sending interrupt signal to process
20:24:27  [310/6018] CXX obj/components/sync/base/test_support/trackable_mock_invalidation.o
20:24:27  ninja: build stopped: interrupted by user.
20:24:27  script returned exit code 143

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.19.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #7575 (comment).

@kjozwiak kjozwiak merged commit 7cd385f into 1.19.x Jan 14, 2021
@kjozwiak kjozwiak deleted the pr7575_android_settings_migration_fix_1.19.x branch January 14, 2021 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants