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.

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

USSBookmarks migration and sync fixes (uplift to 1.4.x) #4412

Merged
merged 3 commits into from
Feb 3, 2020
Merged

USSBookmarks migration and sync fixes (uplift to 1.4.x) #4412

merged 3 commits into from
Feb 3, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jan 22, 2020 •
edited by bsclifton
Loading

Uplift of #4324 (USSBookmarks migration)
Fixes brave/brave-browser#6437

Uplift of #4420 (Ignore bookmark icon url when browser gets bookmark form sync cloud)
Fixes brave/brave-browser#7893

Uplift of #4458
Fixes brave/brave-browser#7948

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 self-assigned this Jan 22, 2020
@brave-builds brave-builds added this to the 1.4.x - Dev milestone Jan 22, 2020
@kjozwiak
Copy link
Member

Restarting iOS due to https://ci.brave.com/job/brave-browser-build-pr/job/pr4324_uss-bookmarks_1.4.x/1/execution/node/115/ failing.

Restarting macOS due to https://ci.brave.com/job/brave-browser-build-pr/job/pr4324_uss-bookmarks_1.4.x/1/execution/node/600/log/ failing.

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-linux labels Jan 23, 2020
@kjozwiak
Copy link
Member

Looks like it failed to fetch the repo on iOS as per https://ci.brave.com/job/brave-browser-build-pr/job/pr4324_uss-bookmarks_1.4.x/2/execution/node/294/log/. Going to restart iOS and see if that helps.

@kjozwiak kjozwiak added the CI/skip-macos-x64 Do not run CI builds for macOS x64 label Jan 23, 2020
@bsclifton
Copy link
Member

per #4324 (comment), let's hold off on uplift. Will mark as blocked

@kjozwiak
Copy link
Member

Still PR/Blocked until we got more information on brave/brave-browser#7948 that @btlechowski found on Nightly.

@bsclifton bsclifton removed CI/skip-android Do not run CI builds for Android CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 Uplift/Blocked labels Jan 30, 2020
@bsclifton bsclifton requested review from a team and removed request for bridiver, bbondy, kjozwiak, bsclifton, rebron and srirambv January 30, 2020 04:49
@bsclifton bsclifton mentioned this pull request Jan 30, 2020
Closed
4 tasks
@bsclifton bsclifton changed the title USSBookmarks migration (uplift to 1.4.x) USSBookmarks migration and sync fixes (uplift to 1.4.x) Jan 30, 2020
@mkarolin mkarolin mentioned this pull request Jan 31, 2020
Merged
32 tasks
@kjozwiak
Copy link
Member

kjozwiak commented Feb 1, 2020

Restarting Linux due to https://ci.brave.com/job/brave-browser-build-pr/job/pr4324_uss-bookmarks_1.4.x/5/execution/node/502/log/ failing.

Restarting macOS due to https://ci.brave.com/job/brave-browser-build-pr/job/pr4324_uss-bookmarks_1.4.x/5/execution/node/596/log/ failing.

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-windows labels Feb 1, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Feb 1, 2020

Restarting one last time as the same failures occurred as per #4412 (comment)

kjozwiak
kjozwiak approved these changes Feb 3, 2020
View reviewed changes
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.4.x approved after deliberating with @brave/uplift-approvers. Please ensure that all the correct labels are being used and the associated issue(s) are merged into the correct milestone.

@btlechowski also ran rough the PRs on Nightly as per #4324 (comment).

@kjozwiak kjozwiak merged commit d037fba into 1.4.x Feb 3, 2020
@kjozwiak kjozwiak deleted the pr4324_uss-bookmarks_1.4.x branch February 3, 2020 06:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@brave-builds brave-builds

Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS
Projects
None yet
Milestone
1.4.x - Release
Development

Successfully merging this pull request may close these issues.
6 participants
@brave-builds @kjozwiak @bsclifton @brave-browser-releases @AlexeyBarabash @darkdh