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

Fixed default SR topsites are disappeared when toggling themes option (uplift to 1.13.x) #6371

Merged
merged 1 commit into from
Aug 17, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Aug 7, 2020

Uplift of #6261
Resolves brave/brave-browser#11009

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 August 7, 2020 03:14
@brave-builds brave-builds self-assigned this Aug 7, 2020
@brave-builds brave-builds added this to the 1.13.x - Beta milestone Aug 7, 2020
@simonhong simonhong self-assigned this Aug 7, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Aug 7, 2020

Looks like Android timed out as per https://ci.brave.com/job/pr-brave-browser-pr6261_fix_topsites_super_referrals_1.13.x/1/execution/node/218/log/.

23:19:21  Cannot contact ecs-android-android-ecs-g3sdb: hudson.remoting.ChannelClosedException: Channel "hudson.remoting.Channel@124fdb74:JNLP4-connect connection from ip-172-31-42-166.us-west-2.compute.internal/172.31.42.166:38412": Remote call on JNLP4-connect connection from ip-172-31-42-166.us-west-2.compute.internal/172.31.42.166:38412 failed. The channel is closing down or has closed down
01:19:05  Could not connect to ecs-android-android-ecs-g3sdb to send interrupt signal to process

@kjozwiak kjozwiak added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Aug 7, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Aug 7, 2020

@simonhong this one might need a rebase as we've merged #6276 & brave/brave-browser#11026 into 1.12.x and 1.13.x.

@simonhong simonhong force-pushed the pr6261_fix_topsites_super_referrals_1.13.x branch from 51fc393 to 4359cd4 Compare August 7, 2020 06:28
@simonhong
Copy link
Member

@kjozwiak rebased and pushed.

@kjozwiak
Copy link
Member

CI looks good as continuous-integration/jenkins/pr-head appears green 👍 This PR was created/passed before @mihaiplesa implemented the separate pipelines for each platform.

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

@kjozwiak kjozwiak merged commit afcf669 into 1.13.x Aug 17, 2020
@kjozwiak kjozwiak deleted the pr6261_fix_topsites_super_referrals_1.13.x branch August 17, 2020 21:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants