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

Get and update sync code only after sync chain is created (uplift to 1.12.x) #6232

Merged
merged 1 commit into from
Jul 28, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jul 28, 2020

Uplift of #6182
Resolves brave/brave-browser#10857

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 July 28, 2020 04:51
@brave-builds brave-builds self-assigned this Jul 28, 2020
@brave-builds brave-builds added this to the 1.12.x - Beta milestone Jul 28, 2020
@kjozwiak
Copy link
Member

Looks test-browser failed on Win as per https://ci.brave.com/job/pr-brave-browser-pr6182_sync-words-mismatch_1.12.x/1/execution/node/731/log/. However, this is a known intermittent issue and doesn't block uplift.

03:23:42  [609/609] SpeedReaderBrowserTest.SmokeTest (3476 ms)
03:23:42  1 test failed:
03:23:42      SpeedReaderBrowserTest.SmokeTest (../../brave/browser/speedreader/speedreader_browsertest.cc:65)

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.12.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #6182 (comment).

@kjozwiak kjozwiak merged commit b6b7c7e into 1.12.x Jul 28, 2020
@kjozwiak kjozwiak deleted the pr6182_sync-words-mismatch_1.12.x branch July 28, 2020 21:05
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