opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.1'

Browse Source 
* stable-3.1:
  Update paper-styles to a6c207e6eee3402fd7a6550e6f9c387ca22ec4c4
  Update 'font-roboto' to 'font-roboto-local' in license files
  Update paper-styles to dd0b13e186b9690d5e74a93f6e51e0835ea60495
  Change on-tap to on-click for iron-dropdown
  Fix reporting for flaky builds in Jenkinsfile

Change-Id: I9a319fbe4a7d6995c3338c861f487358703eb9f9
This commit is contained in:
David Pursehouse 2019-11-26 13:14:34 +09:00
commit 8705396bf2
6 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/js_licenses.txt
View File

@ -409,7 +409,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
[[polymer]] [[polymer]]
polymer polymer
* js:font-roboto * js:font-roboto-local
* js:iron-a11y-announcer * js:iron-a11y-announcer
* js:iron-a11y-keys-behavior * js:iron-a11y-keys-behavior
* js:iron-autogrow-textarea * js:iron-autogrow-textarea

2
Documentation/licenses.txt
View File

@ -2666,7 +2666,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
[[polymer]] [[polymer]]
polymer polymer
* js:font-roboto * js:font-roboto-local
* js:iron-a11y-announcer * js:iron-a11y-announcer
* js:iron-a11y-keys-behavior * js:iron-a11y-keys-behavior
* js:iron-autogrow-textarea * js:iron-autogrow-textarea

14
Jenkinsfile vendored
View File

@ -154,18 +154,19 @@ def collectBuildModes() {
} }
def prepareBuildsForMode(buildName, mode="notedb", retryTimes = 1) { def prepareBuildsForMode(buildName, mode="notedb", retryTimes = 1) {
def propagate = retryTimes == 1 ? false : true
return { return {
stage("${buildName}/${mode}") { stage("${buildName}/${mode}") {
catchError{ def slaveBuild = null
retry(retryTimes){ for (int i = 1; i <= retryTimes; i++) {
def slaveBuild = build job: "${buildName}", parameters: [ try {
slaveBuild = build job: "${buildName}", parameters: [
string(name: 'REFSPEC', value: Change.ref), string(name: 'REFSPEC', value: Change.ref),
string(name: 'BRANCH', value: Change.sha1), string(name: 'BRANCH', value: Change.sha1),
string(name: 'CHANGE_URL', value: Change.url), string(name: 'CHANGE_URL', value: Change.url),
string(name: 'MODE', value: mode), string(name: 'MODE', value: mode),
string(name: 'TARGET_BRANCH', value: Change.branch) string(name: 'TARGET_BRANCH', value: Change.branch)
], propagate: propagate ], propagate: false
} finally {
if (buildName == "Gerrit-codestyle"){ if (buildName == "Gerrit-codestyle"){
Builds.codeStyle = new Build( Builds.codeStyle = new Build(
slaveBuild.getAbsoluteUrl(), slaveBuild.getResult()) slaveBuild.getAbsoluteUrl(), slaveBuild.getResult())
@ -173,6 +174,9 @@ def prepareBuildsForMode(buildName, mode="notedb", retryTimes = 1) {
Builds.verification[mode] = new Build( Builds.verification[mode] = new Build(
slaveBuild.getAbsoluteUrl(), slaveBuild.getResult()) slaveBuild.getAbsoluteUrl(), slaveBuild.getResult())
} }
if (slaveBuild.getResult() == "SUCCESS") {
break
}
} }
} }
} }

12
lib/js/bower_archives.bzl
View File

@ -26,10 +26,10 @@ def load_bower_archives():
sha1 = "849ad3ee7c77506548b7b5db603a4e150b9431aa", sha1 = "849ad3ee7c77506548b7b5db603a4e150b9431aa",
) )
bower_archive( bower_archive(
name = "font-roboto", name = "font-roboto-local",
package = "PolymerElements/font-roboto", package = "PolymerElements/font-roboto-local",
version = "1.1.0", version = "1.1.0",
sha1 = "ab4218d87b9ce569d6282b01f7642e551879c3d5", sha1 = "de651abf9b1b2d0935f7b264d48131677196412f",
) )
bower_archive( bower_archive(
name = "iron-a11y-announcer", name = "iron-a11y-announcer",
@ -136,8 +136,10 @@ def load_bower_archives():
bower_archive( bower_archive(
name = "paper-styles", name = "paper-styles",
package = "PolymerElements/paper-styles", package = "PolymerElements/paper-styles",
version = "2.1.0", # Basically 2.1.0 but with
sha1 = "c143c5491571a6922c06ffe7fdf64ec009ec2eb1", # https://github.com/PolymerElements/paper-styles/pull/165 applied
version = "a6c207e6eee3402fd7a6550e6f9c387ca22ec4c4",
sha1 = "6bd17410578b5d4017ccef330393a4b41b1c716e",
) )
bower_archive( bower_archive(
name = "shadycss", name = "shadycss",

4
lib/js/bower_components.bzl
View File

@ -30,7 +30,7 @@ def define_bower_components():
seed = True, seed = True,
) )
bower_component( bower_component(
name = "font-roboto", name = "font-roboto-local",
license = "//lib:LICENSE-polymer", license = "//lib:LICENSE-polymer",
) )
bower_component( bower_component(
@ -283,7 +283,7 @@ def define_bower_components():
name = "paper-styles", name = "paper-styles",
license = "//lib:LICENSE-polymer", license = "//lib:LICENSE-polymer",
deps = [ deps = [
":font-roboto", ":font-roboto-local",
":iron-flex-layout", ":iron-flex-layout",
":polymer", ":polymer",
], ],

4
tools/js/bower2bazel.py
View File

@ -38,7 +38,7 @@ package_licenses = {
"codemirror-minified": "codemirror-minified", "codemirror-minified": "codemirror-minified",
"es6-promise": "es6-promise", "es6-promise": "es6-promise",
"fetch": "fetch", "fetch": "fetch",
"font-roboto": "polymer", "font-roboto-local": "polymer",
"iron-a11y-announcer": "polymer", "iron-a11y-announcer": "polymer",
"iron-a11y-keys-behavior": "polymer", "iron-a11y-keys-behavior": "polymer",
"iron-autogrow-textarea": "polymer", "iron-autogrow-textarea": "polymer",
@ -77,7 +77,7 @@ package_licenses = {
"paper-behaviors": "polymer", "paper-behaviors": "polymer",
"paper-ripple": "polymer", "paper-ripple": "polymer",
"iron-checked-element-behavior": "polymer", "iron-checked-element-behavior": "polymer",
"font-roboto": "polymer", "font-roboto-local": "polymer",
} }