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 85.0.4183.121 to Chromium 85.0.4183.127. #6690

Merged
merged 1 commit into from
Sep 24, 2020

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Sep 23, 2020

Fixes brave/brave-browser#11827
Related PR: brave/brave-browser#11828

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@kjozwiak
Copy link
Member

Restarting Win x64 via https://ci.brave.com/job/pr-brave-browser-85.0.4183.127_1.14.x_61-windows/3/ due to init failing as per https://ci.brave.com/job/pr-brave-browser-85.0.4183.127_1.14.x_61-windows/2/execution/node/135/log/.

20:53:36  Sending interrupt signal to process
20:53:40  script returned exit code -1

Restarting macOS via https://ci.brave.com/job/pr-brave-browser-85.0.4183.127_1.14.x_61-macos/3/ due to build failing as per https://ci.brave.com/job/pr-brave-browser-85.0.4183.127_1.14.x_61-macos/2/execution/node/177/log/.

20:53:55  FAILED: brave_rust/out/x64/x86_64-apple-darwin/release/libbrave_rust.a 

Restarting Linux via https://ci.brave.com/job/pr-brave-browser-85.0.4183.127_1.14.x_61-linux/3/ due to init failing as per https://ci.brave.com/job/pr-brave-browser-85.0.4183.127_1.14.x_61-linux/2/execution/node/127/log/.

17:00:08  Error: Command 'vpython src/third_party/depot_tools/download_from_google_storage.py --no_resume --directory --recursive --no_auth --num_threads=16 --bucket chromium-apache-mac src/third_party/apache-mac' returned non-zero exit status 252 in /Users/jenkins/jenkins/workspace/pr-brave-browser-85.0.4183.127_1.14.x_61-linux
17:00:08  Hook 'vpython src/third_party/depot_tools/download_from_google_storage.py --no_resume --directory --recursive --no_auth --num_threads=16 --bucket chromium-apache-mac src/third_party/apache-mac' took 24.66 secs

@kjozwiak
Copy link
Member

test-browser failed on Win x64 due to GreaselionServiceTest.ScriptInjectionWithPrecondition failing as per https://ci.brave.com/job/pr-brave-browser-85.0.4183.127_1.14.x_61-windows/3/execution/node/245/log/. However, this is a known intermittent issue and doesn't block uplift.

04:19:32  [  FAILED  ] GreaselionServiceTest.ScriptInjectionWithPrecondition, where TypeParam =  and GetParam() =  (2883 ms)
04:19:32  
04:19:32  [605/605] GreaselionServiceTest.ScriptInjectionWithPrecondition (3079 ms)
04:19:32  1 test failed:
04:19:32      GreaselionServiceTest.ScriptInjectionWithPrecondition (../../brave/browser/greaselion/greaselion_browsertest.cc:265)
04:19:32  null

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

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