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

Upgrade patches from Chromium 91.0.4472.70 to Chromium 91.0.4472.77 (1.25.x). #8924

Merged
merged 1 commit into from
May 25, 2021

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented May 25, 2021

Fixes brave/brave-browser#16054
Related PR: brave/brave-browser#16073
Uplift from #8916

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • 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)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • 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:

Upgrade patches from Chromium 91.0.4472.70 to Chromium 91.0.4472.77
@mkarolin mkarolin added the CI/run-network-audit Run network-audit label May 25, 2021
@mkarolin mkarolin requested a review from a team May 25, 2021 15:27
@mkarolin mkarolin requested a review from a team as a code owner May 25, 2021 15:27
@mkarolin mkarolin self-assigned this May 25, 2021
@kjozwiak
Copy link
Member

post-init failed due to several warning(s) via audit-deps as per https://ci.brave.com/job/pr-brave-browser-91.0.4472.77_master_101-1.25.x-post-init/2/execution/node/145/log/. However, this is a known issue and unrelated to this specific PR.

test-browser failed on Linux as per https://ci.brave.com/job/pr-brave-browser-91.0.4472.77_master_101-1.25.x-linux/3/testReport/. However, these are known intermittent issues and unrelated to this specific PR.

linux / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion062WithRewardsEnabled_ForSupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled
linux / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion062WithRewardsEnabled_ForUnsupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled
linux / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion070WithRewardsAndAdsEnabled_ForSupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeEnabled
linux / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion072WithRewardsAndAdsEnabled_ForSupportedLocale_ForNewlySupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled
linux / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion072WithRewardsAndAdsEnabled_ForSupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeEnabled

@kjozwiak kjozwiak added this to the 1.25.x - Release milestone May 25, 2021
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.25.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit ab62968 into 1.25.x May 25, 2021
@kjozwiak kjozwiak deleted the 91.0.4472.77_master_101-1.25.x branch May 25, 2021 23:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-network-audit Run network-audit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants