diff --git a/Documentation/dev-eclipse.txt b/Documentation/dev-eclipse.txt index f7d0c738b9..5f69cd3d2b 100644 --- a/Documentation/dev-eclipse.txt +++ b/Documentation/dev-eclipse.txt @@ -4,7 +4,7 @@ This document is about configuring Gerrit Code Review into an Eclipse workspace for development. -Java 8 or later SDK is require +Java 8 or later SDK is required. [[setup]] == Project Setup diff --git a/Jenkinsfile b/Jenkinsfile index cb083b46b0..756c1d4341 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,6 @@ class Globals { static final long curlTimeout = 10000 static final int waitForResultTimeout = 10000 static final String gerritRepositoryNameSha1Suffix = "-a6a0e4682515f3521897c5f950d1394f4619d928" - static final resTicks = [ 'ABORTED':'\u26aa', 'SUCCESS':'\u2705', 'FAILURE':'\u274c' ] } class Change { @@ -54,11 +53,13 @@ class Builds { class GerritCheck { String uuid Build build + String consoleUrl GerritCheck(name, build) { this.uuid = "gerritforge:" + name.replaceAll("(bazel/)", "") + Globals.gerritRepositoryNameSha1Suffix this.build = build + this.consoleUrl = "${build.url}console" } def getCheckResultFromBuild() { @@ -74,14 +75,6 @@ class GerritCheck { return "FAILED" } } - - def createCheckPayload() { - return JsonOutput.toJson([ - checker_uuid: uuid, - state: getCheckResultFromBuild(), - url: "${build.url}consoleText" - ]) - } } def hasChangeNumber() { @@ -89,7 +82,7 @@ def hasChangeNumber() { } def postCheck(check) { - gerritCheck(checks: [ "${check.uuid}" : "${check.getCheckResultFromBuild()}" ]) + gerritCheck(checks: [ "${check.uuid}" : "${check.getCheckResultFromBuild()}" ], url: "${check.consoleUrl}") } def queryChangedFiles(url, changeNum, sha1) { @@ -247,25 +240,6 @@ def findCodestyleFilesInLog(build) { return codeStyleFiles } -def createCodeStyleMsgBody(build, label) { - def codeStyleFiles = findCodestyleFilesInLog(build) - def formattingMsg = label < 0 ? ('The following files need formatting:\n ' + - codeStyleFiles.join('\n ')) : 'All files are correctly formatted' - def url = build.url + "consoleText" - - return "${Globals.resTicks[build.result]} $formattingMsg\n (${url})" -} - -def createVerifyMsgBody(builds) { - def msgList = builds.collect { type, build -> [ - 'type': type, 'res': build.result, 'url': build.url + "consoleText" ] - } - - return msgList.collect { - "${Globals.resTicks[it.res]} ${it.type} : ${it.res}\n (${it.url})" - } .join('\n') -} - node ('master') { if (hasChangeNumber()) { @@ -292,18 +266,14 @@ node ('master') { stage('Report to Gerrit'){ resCodeStyle = getLabelValue(1, Builds.codeStyle.result) - gerritReview( - labels: ['Code-Style': resCodeStyle], - message: createCodeStyleMsgBody(Builds.codeStyle, resCodeStyle)) + gerritReview labels: ['Code-Style': resCodeStyle] postCheck(new GerritCheck("codestyle", Builds.codeStyle)) def verificationResults = Builds.verification.collect { k, v -> v } def resVerify = verificationResults.inject(1) { acc, build -> getLabelValue(acc, build.result) } - gerritReview( - labels: ['Verified': resVerify], - message: createVerifyMsgBody(Builds.verification)) + gerritReview labels: ['Verified': resVerify] Builds.verification.each { type, build -> postCheck( new GerritCheck(type, build) diff --git a/plugins/webhooks b/plugins/webhooks index b620659883..377fec17d2 160000 --- a/plugins/webhooks +++ b/plugins/webhooks @@ -1 +1 @@ -Subproject commit b620659883781318cf3745582df6291acb2b9dad +Subproject commit 377fec17d2c0fc71cdfb1d12f502cfa1eba1fbd7 diff --git a/tools/bzl/js.bzl b/tools/bzl/js.bzl index b14a76163e..6132e9915f 100644 --- a/tools/bzl/js.bzl +++ b/tools/bzl/js.bzl @@ -323,6 +323,7 @@ def _bundle_impl(ctx): "$p/" + ctx.file._bundler_archive.path, "--inline-scripts", "--inline-css", + "--sourcemaps", "--strip-comments", "--out-file", "$p/" + bundled.path, diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index fa8008c814..5cc1511652 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -108,8 +108,8 @@ def declare_nongoogle_deps(): maven_jar( name = "jackson-core", - artifact = "com.fasterxml.jackson.core:jackson-core:2.10.1", - sha1 = "2c8b5e26ba40e5f91eb37a24075a2028b402c5f9", + artifact = "com.fasterxml.jackson.core:jackson-core:2.10.2", + sha1 = "73d4322a6bda684f676a2b5fe918361c4e5c7cca", ) # Test-only dependencies below.