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 79.0.3945.88 to Chromium 79.0.3945.117 (uplift to 1.2) #4320

Merged
merged 1 commit into from
Jan 8, 2020

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Jan 7, 2020

Uplift of #4319
Fixes brave/brave-browser#7640
Related: brave/brave-browser#7646

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.

Upgrade patches from Chromium 79.0.3945.88 to Chromium 79.0.3945.117
@kjozwiak
Copy link
Member

kjozwiak commented Jan 8, 2020

@bsclifton looks like the only failure on Jenkins is on Linux due to https://ci.brave.com/job/brave-browser-build-pr/job/PR-7646/2/execution/node/547/log/ which is a known intermittent issue:

19:29:48  {"phase":2,"source":{"id":103,"type":8}]}
19:29:48                                         ^
19:29:48  
19:29:48  SyntaxError: Unexpected token ] in JSON at position 79101247
19:29:48      at JSON.parse (<anonymous>)
19:29:48      at start (/home/ubuntu/jenkins/workspace/brave-browser-build-pr_PR-7646/lib/start.js:144:23)
19:29:48      at Command.listener (/home/ubuntu/jenkins/workspace/brave-browser-build-pr_PR-7646/node_modules/commander/index.js:315:8)
19:29:48      at Command.emit (events.js:210:5)
19:29:48      at Command.parseArgs (/home/ubuntu/jenkins/workspace/brave-browser-build-pr_PR-7646/node_modules/commander/index.js:654:12)
19:29:48      at Command.parse (/home/ubuntu/jenkins/workspace/brave-browser-build-pr_PR-7646/node_modules/commander/index.js:474:21)
19:29:48      at Object.<anonymous> (/home/ubuntu/jenkins/workspace/brave-browser-build-pr_PR-7646/scripts/commands.js:158:4)
19:29:48      at Module._compile (internal/modules/cjs/loader.js:956:30)
19:29:48      at Object.Module._extensions..js (internal/modules/cjs/loader.js:973:10)
19:29:48      at Module.load (internal/modules/cjs/loader.js:812:32)

I'm not 100% sure about the Travis failure as per https://travis-ci.org/brave/brave-core/jobs/634008577?utm_medium=notification&utm_source=github_status.

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.2.x approved after deliberating with @brave/uplift-approvers. CI/Jenkins failed on Linux as per #4320 (comment). However, it's a known intermittent issue that's been happening on Linux for sometime now and isn't associated with this particular PR.

Travis also failed as per https://travis-ci.org/brave/brave-core/jobs/634008577?utm_medium=notification&utm_source=github_status which isn't due to this particular PR.

@kjozwiak kjozwiak merged commit 3aefbdf into 1.2.x Jan 8, 2020
@kjozwiak kjozwiak deleted the bsc-79.0.3945.117-1.2.x branch January 8, 2020 03:48
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.

2 participants