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

Search update 1.12.x (uplift to 1.12.x) #6243

Merged
merged 17 commits into from
Aug 4, 2020
Merged

Conversation

deeppandya
Copy link
Contributor

@deeppandya deeppandya commented Jul 29, 2020

Uplift of #6201
Fixes brave/brave-browser#10890

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.

@deeppandya deeppandya added this to the 1.12.x - Release milestone Jul 29, 2020
@deeppandya deeppandya requested a review from a team July 29, 2020 00:01
@deeppandya deeppandya requested a review from bridiver as a code owner July 29, 2020 00:01
@deeppandya deeppandya changed the title Search update 1.12.x Search update 1.12.x (uplift to 1.11.x) Jul 29, 2020
@deeppandya deeppandya changed the title Search update 1.12.x (uplift to 1.11.x) Search update 1.12.x (uplift to 1.12.x) Jul 29, 2020
@bsclifton bsclifton removed the request for review from bridiver July 29, 2020 06:10
@bsclifton
Copy link
Member

bsclifton commented Jul 29, 2020

Notes:

  • Verified changes on Nightly
    • It's been in Nightly for over 24 hours and we're seeing attributed queries come through
    • After train migration, it should be in Beta now too 👍
    • I tested Desktop and Android
  • On Android, 1.12 was slightly different than 1.13 - @deeppandya maybe you can help me verify that the patch we did worked well (we'll need CI to finish so we can grab APK file 😄 )
  • I tested this branch on 1.12 manually on Desktop (Windows). Besides the test steps working, all unit and browser tests pass 🎉

@deeppandya deeppandya force-pushed the search-update-1.12.x branch 2 times, most recently from b2ff9c2 to 45fefd4 Compare July 30, 2020 05:51
@deeppandya
Copy link
Contributor Author

We need to have #6273 uplift for 1.12

@bsclifton
Copy link
Member

@deeppandya can you cherry-pick that into here too?

@deeppandya
Copy link
Contributor Author

@deeppandya can you cherry-pick that into here too?

yeah so i was thinking the same. but wanted to check first. i will update this PR

@bsclifton
Copy link
Member

Looks like there was a timeout on Windows; all other platforms passed just fine. Restarting for Windows only

@bsclifton bsclifton added CI/skip-android Do not run CI builds for Android 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 and removed CI/skip-android Do not run CI builds for Android labels Aug 3, 2020
@bsclifton
Copy link
Member

Leaving skipped tags for other platforms; pinged @deeppandya about rebase of Android only file. We can resolve and let CI run for Android, then it's ready for approval 😄

bsclifton and others added 8 commits August 3, 2020 11:31
Yahoo using SYC (search.yahoo.com) is split by region. Placeholders
created for most regions.

Fixes brave/brave-browser#10890
- Added vector icon (not used yet)
- added PNG files (multiple resolutions)
- added enum value / wired up to onboarding screen
Update code to show Yahoo on seach engine page
@bsclifton bsclifton force-pushed the search-update-1.12.x branch from 7bd7de2 to 00b3f14 Compare August 3, 2020 18:43
@bsclifton
Copy link
Member

Rebased! 😄👍

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

@kjozwiak kjozwiak merged commit 3634a8e into 1.12.x Aug 4, 2020
@kjozwiak kjozwiak deleted the search-update-1.12.x branch August 4, 2020 22:13
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