Skip to content

Upgrade from Chromium 76.0.3809.132 to Chromium 77.0.3865.75 (uplift to 0.68.x) #5943

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.

Sign up for GitHub

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

Merged
bsclifton merged 7 commits into from
Sep 11, 2019
Merged

Upgrade from Chromium 76.0.3809.132 to Chromium 77.0.3865.75 (uplift to 0.68.x) #5943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5054873
Merge pull request #5896 from brave/77.0.3865.65
bsclifton Sep 6, 2019
14761da
0.68.133
brave-browser-releases Sep 10, 2019
bba2b1d
Update Jenkinsfile
mihaiplesa Sep 10, 2019
604a9a6
Use shorter workspace on Windows CI builds (attempt #2)
mbacchi Sep 4, 2019
eff5bef
Merge pull request #5972 from brave/maxk-fix-lint-script
mkarolin Sep 10, 2019
dbc4c40
Upgrade from Chromium 77.0.3865.65 to Chromium 77.0.3865.75
mkarolin Sep 10, 2019
ffbe2cd
0.68.134
brave-browser-releases Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,15 +671,20 @@ pipeline {
beforeAgent true
expression { !SKIP_WINDOWS }
}
agent { label "windows-ci" }
agent {
node {
label "windows-ci"
customWorkspace "${WINDOWS_CUSTOM_WORKSPACE}"
}
}
environment {
GIT_CACHE_PATH = "${USERPROFILE}\\cache"
SCCACHE_BUCKET = credentials("brave-browser-sccache-win-s3-bucket")
PATH = "C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.17134.0\\x64\\;C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\IDE\\Remote Debugger\\x64;${PATH}"
SIGNTOOL_ARGS = "sign /t http://timestamp.digicert.com /fd sha256 /sm"
CERT = "Brave"
KEY_CER_PATH = "C:\\jenkins\\digicert-key\\digicert.cer"
KEY_PFX_PATH = "C:\\jenkins\\digicert-key\\digicert.pfx"
KEY_CER_PATH = "C:\\jenkins\\digicert.cer"
KEY_PFX_PATH = "C:\\jenkins\\digicert.pfx"
AUTHENTICODE_PASSWORD = credentials("digicert-brave-browser-ci-certificate-ps-escaped")
AUTHENTICODE_PASSWORD_UNESCAPED = credentials("digicert-brave-browser-ci-certificate")
SIGN_WIDEVINE_CERT = credentials("widevine_brave_prod_cert.der")
Expand Down Expand Up @@ -921,6 +926,7 @@ def setEnv() {
if (env.SLACK_USERNAME) {
slackSend(color: null, channel: env.SLACK_USERNAME, message: "[${BUILD_TAG_SLASHED} `${BRANCH}`] STARTED (<${BUILD_URL}/flowGraphTable/?auto_refresh=true|Open>)")
}
WINDOWS_CUSTOM_WORKSPACE = "C:\\temp\\" + "PR-" + env.BC_PR_NUMBER + "-BLD-" + env.BUILD_NUMBER
}

def checkAndAbortBuild() {
Expand Down
4 changes: 2 additions & 2 deletions lib/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ Config.prototype.buildArgs = function () {
if (this.targetOS === 'android') {
args.target_os = 'android'
if (!this.officialBuild) {
args.manifest_package = 'com.brave.browser_default'
args.chrome_public_manifest_package = 'com.brave.browser_default'
} else {
args.manifest_package = 'com.brave.browser'
args.chrome_public_manifest_package = 'com.brave.browser'
}

// TODO(fixme)
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "brave",
"version": "0.68.132",
"version": "0.68.134",
"description": "Next generation Brave browser for macOS, Windows, Linux, and eventually Android",
"scripts": {
"audit_deps": "node ./scripts/audit.js",
Expand All @@ -26,7 +26,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "76.0.3809.132",
"tag": "77.0.3865.75",
"repository": {
"url": "https://chromium.googlesource.com/chromium/src.git"
},
Expand Down
5 changes: 1 addition & 4 deletions scripts/lint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import git_cl
import git_common
import auth

def main(args):
"""Runs cpplint on the current changelist."""
Expand All @@ -29,9 +28,7 @@ def main(args):
help='Comma-separated list of cpplint\'s category-filters')
parser.add_option('--project_root')
parser.add_option('--base_branch')
auth.add_auth_options(parser)
options, args = parser.parse_args(args)
auth_config = auth.extract_auth_config_from_options(options)

# Access to a protected member _XX of a client class
# pylint: disable=protected-access
Expand All @@ -48,7 +45,7 @@ def main(args):
previous_cwd = os.getcwd()
os.chdir(settings.GetRoot())
try:
cl = git_cl.Changelist(auth_config=auth_config)
cl = git_cl.Changelist()
change = cl.GetChange(git_common.get_or_create_merge_base(cl.GetBranch(), options.base_branch), None)
files = [f.LocalPath() for f in change.AffectedFiles()]
if not files:
Expand Down