diff --git a/Jenkinsfile b/Jenkinsfile index e55fa586a226..b4a79c2c7f64 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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") @@ -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() { diff --git a/lib/config.js b/lib/config.js index 58c40af5621f..1af2564e19bb 100755 --- a/lib/config.js +++ b/lib/config.js @@ -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) diff --git a/package-lock.json b/package-lock.json index 569707345e74..2e6f29f3e39b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "brave", - "version": "0.68.132", + "version": "0.68.134", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index aaf443bc716f..7c7158535618 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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" }, diff --git a/scripts/lint.py b/scripts/lint.py index d4203c47825b..d80bd3122112 100644 --- a/scripts/lint.py +++ b/scripts/lint.py @@ -19,7 +19,6 @@ import git_cl import git_common -import auth def main(args): """Runs cpplint on the current changelist.""" @@ -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 @@ -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: