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

Sync duplicated object id migration fixes (uplift to 1.7.x) #5212

Merged
merged 4 commits into from
Apr 11, 2020

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Apr 9, 2020

Manual uplift of #4940 and #5139
Fixes brave/brave-browser#8358
Fixes brave/brave-browser#9110

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.

AlexeyBarabash and others added 4 commits April 9, 2020 10:30
Migration of duplicated bookmarks for sync (2)
- Prevents brave/brave-browser#9110 (or similar) from happening
- Added unit test to ensure migration not done if sync disabled
@bsclifton bsclifton added this to the 1.7.x - Release milestone Apr 9, 2020
@bsclifton bsclifton requested review from AlexeyBarabash and a team April 9, 2020 17:35
@bsclifton bsclifton self-assigned this Apr 9, 2020
@bsclifton
Copy link
Member Author

Cherry picked commits directly from #5139 (after uplifting #4940) so that CI can start to run

Copy link
Contributor

@AlexeyBarabash AlexeyBarabash left a comment

Choose a reason for hiding this comment

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

LGTM

@bsclifton
Copy link
Member Author

Travis-CI shows as failure because we didn't uplift the npm vulnerability fixes. JavaScript unit tests and all other checks passed just fine on Travis-CI check 😄

@bsclifton bsclifton added CI/skip-android Do not run CI builds for Android CI/skip-linux labels Apr 9, 2020
@bsclifton
Copy link
Member Author

CI passed great on Android/Linux/Windows. Timed out on macOS/iOS. Going to restart

Copy link
Member

@LaurenWags LaurenWags 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.7.x approved after deliberating with @brave/uplift-approvers. Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

Travis failed due to known issue brave/brave-browser#8722

@bsclifton bsclifton merged commit 18fa0a3 into 1.7.x Apr 11, 2020
@bsclifton bsclifton deleted the bsc-uplift-5139-to-1.7.x branch April 11, 2020 06:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants