Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add Brave Search as an alternative search (uplift to 1.26.x) #9162

Merged
merged 2 commits into from
Jun 19, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jun 17, 2021

Uplift of #8966
Resolves brave/brave-browser#15663

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • 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 as a code owner June 17, 2021 18:26
@brave-builds brave-builds requested a review from a team June 17, 2021 18:26
@brave-builds brave-builds self-assigned this Jun 17, 2021
@brave-builds brave-builds added this to the 1.26.x - Release milestone Jun 17, 2021
@bsclifton bsclifton removed the request for review from a team June 17, 2021 18:53
@kjozwiak
Copy link
Member

Restarting iOS as build` failed as per https://ci.brave.com/job/pr-brave-browser-pr8966_bsc-brave-search_1.26.x-ios/1/execution/node/139/log/.

FAILED: gen/brave/vendor/brave-ios/ads.mojom.objc.h gen/brave/vendor/brave-ios/ads.mojom.objc+private.h gen/brave/vendor/brave-ios/ads.mojom.objc.mm gen/brave/vendor/brave-ios/objc_templates_bytecode/ads_objc_templates.zip 

Restarting Linux as test-browser failed as per https://ci.brave.com/job/pr-brave-browser-pr8966_bsc-brave-search_1.26.x-linux/1/testReport/. I haven't seen these before and @bsclifton mentioned everything passed on macOS & Win locally before uplifting. Going to restart just to make sure these are intermittent and the above PR hasn't caused these tests to fail.

linux / test-browser / BraveContentBrowserClientTest.CanLoadChromeURL
linux / test-browser / BraveToolbarViewTest.AvatarButtonIsShownMultipleProfiles
linux / test-browser / BraveWelcomeUIBrowserTest.StartupURLTest
linux / test-browser / ScriptTriggerWidevinePermissionRequestBrowserTest.SuggestPermissionIfWidevineDetected

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

@kjozwiak kjozwiak merged commit de633de into 1.26.x Jun 19, 2021
@kjozwiak kjozwiak deleted the pr8966_bsc-brave-search_1.26.x branch June 19, 2021 08:42
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants