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 98.0.4758.87 to Chromium 98.0.4758.102 (uplift to 1.36.x). #12274

Merged
merged 1 commit into from
Feb 16, 2022

Conversation

mkarolin
Copy link
Collaborator

Fixes brave/brave-browser#21093
Uplift from #12250

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
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • 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 from Chromium 98.0.4758.87 to Chromium 98.0.4758.102.
@mkarolin mkarolin added the CI/run-network-audit Run network-audit label Feb 15, 2022
@mkarolin mkarolin requested a review from a team February 15, 2022 17:20
@mkarolin mkarolin requested review from samartnik and a team as code owners February 15, 2022 17:20
@mkarolin mkarolin self-assigned this Feb 15, 2022
@github-actions github-actions bot added the CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) label Feb 15, 2022
@kjozwiak
Copy link
Member

macOS failed due to test-browser failing as per https://ci.brave.com/job/pr-brave-browser-98.0.4758.102_master-1.36.x-macos/1/testReport/(root)/BraveShieldsAPIBrowserTest/macos_x64___test_browser___AllowScriptsOnceIframe. However, BraveShieldsAPIBrowserTest.AllowScriptsOnceIframe is a known intermittent issue as per brave/brave-browser#20785 and doesn't block uplift.

noplatform failed audit_dev_deps as per https://ci.brave.com/job/pr-brave-browser-98.0.4758.102_master-1.36.x-noplatform/2/execution/node/199/log/. However, this was already fixed and uplifted into 1.36.x via #12262.

@kjozwiak kjozwiak added this to the 1.36.x - Beta milestone Feb 16, 2022
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.36.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit 3c4eb78 into 1.36.x Feb 16, 2022
@kjozwiak kjozwiak deleted the 98.0.4758.102_master-1.36.x branch February 16, 2022 06:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-network-audit Run network-audit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants