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 from Chromium 91.0.4472.57 to Chromium 91.0.4472.70 (1.25.x). #8876

Merged
merged 2 commits into from
May 23, 2021

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented May 20, 2021

Fixes brave/brave-browser#15973
Related PR: brave/brave-browser#15992
Uplift from #8870

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:

kjozwiak and others added 2 commits May 19, 2021 23:09
Upgrade patches from Chromium 91.0.4472.57 to Chromium 91.0.4472.70.
@mkarolin mkarolin added the CI/run-network-audit Run network-audit label May 20, 2021
@mkarolin mkarolin requested a review from a team May 20, 2021 03:16
@mkarolin mkarolin self-assigned this May 20, 2021
@mkarolin mkarolin requested a review from a team as a code owner May 20, 2021 03:16
@kjozwiak
Copy link
Member

post-install failed due several warning(s) via audit-deps as per https://ci.brave.com/job/pr-brave-browser-91.0.4472.70_master_100-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.70_master_100-1.25.x-linux/3/testReport/. However, these are known intermittent failures and unrelated to this specific PR.

linux / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion062WithRewardsEnabled_ForSupportedLocale_ForNewlySupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled
linux / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion070WithRewardsAndAdsEnabled_ForUnsupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled
linux / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion072WithRewardsAndAdsEnabled_ForSupportedLocale_ForNewlySupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled
linux / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion072WithRewardsAndAdsEnabled_ForSupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeEnabled
linux / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion072WithRewardsAndAdsEnabled_ForUnsupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled

@kjozwiak
Copy link
Member

Restarting macOS as the pipeline timed out due to hitting the 6hr time out limit as per https://ci.brave.com/job/pr-brave-browser-91.0.4472.70_master_100-1.25.x-macos/3/console.

Calling Pipeline was cancelled
15:35:22  Sending interrupt signal to process
15:35:22  Sending interrupt signal to process
15:35:27  ninja: build stopped: interrupted by user.

@kjozwiak kjozwiak added this to the 1.25.x - Release milestone May 23, 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 aeaa66b into 1.25.x May 23, 2021
@kjozwiak kjozwiak deleted the 91.0.4472.70_master_100-1.25.x branch May 23, 2021 06:15
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.

2 participants