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 85.0.4183.83 to Chromium 85.0.4183.102 (1.15.x). #11637

Merged
merged 1 commit into from
Sep 10, 2020

Conversation

mkarolin
Copy link
Contributor

@mkarolin mkarolin commented Sep 9, 2020

Fixes #11621
Related PR: brave/brave-core#6602
Uplift from #11622

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.

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 from Chromium 85.0.4183.83 to Chromium 85.0.4183.102
@kjozwiak
Copy link
Member

kjozwiak commented Sep 9, 2020

test-install failed on Win x64 as per https://ci.brave.com/job/pr-brave-browser-85.0.4183.102-1.15.x-windows/2/execution/node/254/log/. However, this is a known intermittent issue and doesn't block uplift.

12:08:33  powershell.exe : Start-Process : This command cannot be run due to the error: The system cannot find the file specified.
12:08:33  At C:\15.x@tmp\durable-33f01e7f\powershellWrapper.ps1:3 char:1
12:08:33  + & powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -Comm ...
12:08:33  + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
12:08:33      + CategoryInfo          : NotSpecified: (Start-Process :...file specified.:String) [], RemoteException
12:08:33      + FullyQualifiedErrorId : NativeCommandError
12:08:33   
12:08:33  At C:\15.x@tmp\durable-33f01e7f\powershellScript.ps1:10 char:17
12:08:33  + ...             Start-Process "C:\Users\Administrator\AppData\Local\Brave ...
12:08:33  +                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
12:08:33      + CategoryInfo          : InvalidOperation: (:) [Start-Process], InvalidOperationException
12:08:33  
12:08:33      + FullyQualifiedErrorId : InvalidOperationException,Microsoft.PowerShell.Commands.StartProcessCommand

Restarting macOS as build failed as per https://ci.brave.com/job/pr-brave-browser-85.0.4183.102-1.15.x-macos/4/execution/node/172/log/.

14:03:09  ERROR at //build/timestamp.gni:31:19: Script returned non-zero exit code.
14:03:09  build_timestamp = exec_script(compute_build_timestamp,
14:03:09                    ^----------
14:03:09  Current dir: /Users/jenkins/jenkins/workspace/pr-brave-browser-85.0.4183.102-1.15.x-macos/src/out/Release/
14:03:09  Command: python /Users/jenkins/jenkins/workspace/pr-brave-browser-85.0.4183.102-1.15.x-macos/src/build/compute_build_timestamp.py official
14:03:09  Returned 1.
14:03:09  stderr:
14:03:09  
14:03:09  Traceback (most recent call last):
14:03:09    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-85.0.4183.102-1.15.x-macos/src/build/compute_build_timestamp.py", line 126, in <module>
14:03:09      sys.exit(main())
14:03:09    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-85.0.4183.102-1.15.x-macos/src/build/compute_build_timestamp.py", line 112, in main
14:03:09      last_commit_timestamp = int(open(lastchange_file).read())
14:03:09  IOError: [Errno 2] No such file or directory: '/Users/jenkins/jenkins/workspace/pr-brave-browser-85.0.4183.102-1.15.x-macos/src/build/util/LASTCHANGE.committime'
14:03:09  
14:03:09  See //base/BUILD.gn:35:1: whence it was imported.
14:03:09  import("//build/timestamp.gni")
14:03:09  ^-----------------------------
14:03:09  See //BUILD.gn:71:5: which caused the file to be included.
14:03:09      "//base:base_unittests",
14:03:09      ^----------------------

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

@kjozwiak kjozwiak merged commit d86f1f6 into 1.15.x Sep 10, 2020
@kjozwiak kjozwiak deleted the 85.0.4183.102-1.15.x branch September 10, 2020 00:33
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.

3 participants