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

Disables several blink runtime features. (uplift to 1.20.x) #7732

Merged
merged 2 commits into from
Feb 3, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jan 28, 2021

Fixes brave/brave-browser#11133
Fixes brave/brave-browser#11407
Fixes brave/brave-browser#11546
Fixes brave/brave-browser#11547

Uplift of #6933

Also, fixes brave/brave-browser#13825
Uplift of #7744

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.

@brave-builds brave-builds requested a review from a team as a code owner January 28, 2021 01:34
@brave-builds brave-builds requested a review from a team January 28, 2021 01:34
@brave-builds brave-builds self-assigned this Jan 28, 2021
@brave-builds brave-builds added this to the 1.20.x - Beta milestone Jan 28, 2021
@kjozwiak
Copy link
Member

test-browser failed on Linux due to SearchEngineProviderServiceTest.PrivateWindowPrefTestWithNonQwantRegion failing as per https://ci.brave.com/job/pr-brave-browser-pr6933_maxk-disable-sxg-web-bundles-2_1.20.x-linux/1/execution/node/201/log/. However, this is a known intermittent failure as per brave/brave-browser#13131 and doesn't block uplift.

22:04:08  1 test failed:
22:04:08      SearchEngineProviderServiceTest.PrivateWindowPrefTestWithNonQwantRegion (../../brave/browser/search_engines/search_engine_provider_service_browsertest.cc:41)

Restarting Win x64 using SKIP_INIT due to dist failing as per https://ci.brave.com/job/pr-brave-browser-pr6933_maxk-disable-sxg-web-bundles-2_1.20.x-windows/1/execution/node/226/log/. @mihaiplesa has resolved the certificate issue 👍

23:12:41  Generating code
23:12:41  Finished generating code
23:12:41  Copy("scons-out\opt-win\obj\google_update\BraveUpdate_signed.exe", "scons-out\opt-win\obj\google_update\BraveUpdate_unsigned.exe")
23:12:41  Chmod("scons-out\opt-win\obj\google_update\BraveUpdate_signed.exe", 0755)
23:12:41  python C:\20.x\src\brave\vendor\omaha\omaha/tools/retry.py 10 5 ""C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\\x86"/signtool.exe" sign /v /f "C:\jenkins\digicert.pfx" /p "****" /t "http://timestamp.digicert.com" "scons-out\opt-win\obj\google_update\BraveUpdate_signed.exe"
23:12:41  SignTool Error: No certificates were found that met all the given criteria.

@mkarolin
Copy link
Collaborator

@kjozwiak, please, do not merge this one for now. There are issues building this on master for arm64 on Android and Mac.

@kjozwiak
Copy link
Member

@kjozwiak, please, do not merge this one for now. There are issues building this on master for arm64 on Android and Mac.

Sounds good 👍 Thanks for the heads up @mkarolin. Let me know once this is safe. Added the PR/Blocked label for now.

@mkarolin mkarolin force-pushed the pr6933_maxk-disable-sxg-web-bundles-2_1.20.x branch from 49194c9 to d137189 Compare February 2, 2021 19:24
@mkarolin
Copy link
Collaborator

mkarolin commented Feb 2, 2021

Rebased on origin/1.20.x

@mkarolin
Copy link
Collaborator

mkarolin commented Feb 3, 2021

@kjozwiak CI passed.

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

@kjozwiak kjozwiak merged commit 4b4cd7d into 1.20.x Feb 3, 2021
@kjozwiak kjozwiak deleted the pr6933_maxk-disable-sxg-web-bundles-2_1.20.x branch February 3, 2021 07:08
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.

4 participants