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

Update l10n (for 1.18.x release) - 1.18.x. #7341

Merged
merged 2 commits into from
Dec 5, 2020
Merged

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Dec 4, 2020

Fixes brave/brave-browser#13040
Uplift from #7338

Submitter Checklist:

  • There is a ticket for my issue.
  • Used Github auto-closing keywords in the commit message.
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed).
  • Requested a security/privacy review as needed.

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@mkarolin mkarolin requested a review from a team December 4, 2020 16:31
@mkarolin mkarolin requested a review from a team as a code owner December 4, 2020 16:31
@mkarolin mkarolin requested review from marshall and emerick and removed request for a team December 4, 2020 16:31
@mkarolin mkarolin self-assigned this Dec 4, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Dec 5, 2020

test-browser failed on macOS due to several reward issues as per https://ci.brave.com/job/pr-brave-browser-maxk-l10n-1.18.x-macos/1/execution/node/251/log/. However, these are known intermittent issues per brave/brave-browser#12704 and brave/brave-browser#12605.

13:54:35  2 tests failed:
13:54:35      RewardsBrowserTest.UpholdLimitNoBAT (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:397)
13:54:35      RewardsPromotionBrowserTest.ClaimViaSettingsPage (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:195)

test-browser failed on Linux due to SearchEngineProviderP3ATest.DefaultSearchEngineP3A failing as per https://ci.brave.com/job/pr-brave-browser-maxk-l10n-1.18.x-linux/2/execution/node/251/log/. Created brave/brave-browser#13057. However, this failure isn't specific to this PR and doesn't block uplift.

13:47:50  1 test failed:
13:47:50      SearchEngineProviderP3ATest.DefaultSearchEngineP3A (../../brave/browser/search_engines/search_engine_tracker_browsertest.cc:34)

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.18.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit f91d4da into 1.18.x Dec 5, 2020
@kjozwiak kjozwiak deleted the maxk-l10n-1.18.x branch December 5, 2020 05:10
@kjozwiak kjozwiak added this to the 1.18.x - Release milestone Dec 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants