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

Search engine updates (Uplift to 1.19.x) #7564

Merged
merged 7 commits into from
Jan 13, 2021
Merged

Search engine updates (Uplift to 1.19.x) #7564

merged 7 commits into from
Jan 13, 2021

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Jan 11, 2021 •
edited by kjozwiak
Loading

Uplift of #7494
Resolves brave/brave-browser#13283

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.

@bsclifton bsclifton added this to the 1.19.x - Beta milestone Jan 11, 2021
@bsclifton bsclifton requested a review from a team January 11, 2021 20:24
@bsclifton bsclifton requested review from iefremov and a team as code owners January 11, 2021 20:24
@bsclifton bsclifton self-assigned this Jan 11, 2021
@kjozwiak
Copy link
Member

Restarting macOS due to build failing as per https://ci.brave.com/job/pr-brave-browser-bsc-ecosia-1.19.x-macos/1/execution/node/155/log/.

19:14:33  FAILED: obj/brave/browser/ui/bookmark/bookmark/brave_bookmark_tab_helper.o

Restarting Android due to dist failing as per https://ci.brave.com/job/pr-brave-browser-bsc-ecosia-1.19.x-android/1/execution/node/152/log/

16:06:01  FAILED: obj/chrome/android/chrome_java.javac.jar obj/chrome/android/chrome_java.javac.jar.info

post-init failed due to 15:45:56 smallvec 0.6.13 as per https://ci.brave.com/job/pr-brave-browser-bsc-ecosia-1.19.x-post-init/1/execution/node/137/log/. However, this is a known intermittent issue and is being fixed in 1.19.x via #7560.

@kjozwiak
Copy link
Member

kjozwiak commented Jan 12, 2021 •
edited
Loading

Restarting Android one more time but this time using WIPE_WORKSPACE as it failed at the same spot as before as per https://ci.brave.com/job/pr-brave-browser-bsc-ecosia-1.19.x-android/2/execution/node/152/log/.

13:01:23  FAILED: obj/chrome/android/chrome_java.javac.jar obj/chrome/android/chrome_java.javac.jar.info

@bsclifton
Add Ecosia as a default search alternative
7537ee5 
Shown in the following markets:
USA (US), UK (GB), France (FR), Germany (DE), Netherlands (NL), Belgium (BE), Switzerland (CH), Sweden (SE)

Fixes brave/brave-browser#13283
@bsclifton
Update P3A question results
a14be6c
@bsclifton
Remove Yahoo as a default search alternative
d86a878
@bsclifton
Add ecosia to list of vetted engines
f462a82 
Follow up to brave/brave-browser#10575
kjozwiak
kjozwiak approved these changes Jan 13, 2021
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.19.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #7494 (comment) & #7494 (comment).

@kjozwiak kjozwiak merged commit 39d91b1 into 1.19.x Jan 13, 2021
@kjozwiak kjozwiak deleted the bsc-ecosia-1.19.x branch January 13, 2021 07:47
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

@iefremov iefremov Awaiting requested review from iefremov iefremov is a code owner

Assignees

@bsclifton bsclifton

Labels
None yet
Projects
None yet
Milestone
1.19.x - Release
Development

Successfully merging this pull request may close these issues.
3 participants
@bsclifton @kjozwiak @deeppandya