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 80.0.3987.122 to Chromium 80.0.3987.132 (1.5.x). #4826

Merged
merged 1 commit into from
Mar 4, 2020

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Mar 4, 2020

Fixes brave/brave-browser#8499
Related PR: brave/brave-browser#8521
Uplift from: #4817

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.

Upgrade from Chromium 80.0.3987.122 to Chromium 80.0.3987.132.
@mkarolin mkarolin added the CI/run-network-audit Run network-audit label Mar 4, 2020
@mkarolin mkarolin added this to the 1.5.x - Beta milestone Mar 4, 2020
@mkarolin mkarolin requested a review from bridiver as a code owner March 4, 2020 03:47
@mkarolin mkarolin self-assigned this Mar 4, 2020
@bsclifton bsclifton requested review from a team and removed request for bridiver March 4, 2020 05:45
@kjozwiak
Copy link
Member

kjozwiak commented Mar 4, 2020

Restarting macOS due to build failing as per https://ci.brave.com/job/brave-browser-build-pr/job/PR-8521/2/execution/node/720/log/.

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

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels Mar 4, 2020
@mkarolin
Copy link
Collaborator Author

mkarolin commented Mar 4, 2020

Passed MacOS CI.

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.5.x approved after deliberating with @brave/uplift-approvers. Both CI/Jenkins and CI/Travis passed without any failures after restarting macOS. Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit 1e4d837 into 1.5.x Mar 4, 2020
@kjozwiak kjozwiak deleted the 80.0.3987.132-1.5.x branch March 4, 2020 17:02
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 CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants