From f1e50563766ae49f52503d08ec6074c7d9ddc657 Mon Sep 17 00:00:00 2001 From: Soufiane Nassih Date: Tue, 8 Sep 2020 12:57:11 +0100 Subject: [PATCH] Add missing && to filter in coverage navigation template --- mx.py | 2 +- mx_gate.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mx.py b/mx.py index 6ec802da..3be16d8c 100755 --- a/mx.py +++ b/mx.py @@ -16997,7 +16997,7 @@ def alarm_handler(signum, frame): # The version must be updated for every PR (checked in CI) -version = VersionSpec("5.272.1") # GR-25876 +version = VersionSpec("5.272.2") # GR-26016 currentUmask = None _mx_start_datetime = datetime.utcnow() diff --git a/mx_gate.py b/mx_gate.py index 0dfd8eeb..a267ff19 100644 --- a/mx_gate.py +++ b/mx_gate.py @@ -922,7 +922,7 @@ def upload_string(content, path): .filter(x => !x.hasOwnProperty('merge')) .filter( // filter builds that are unique per suite with revision as key x => !data - .filter(z => x != z && x.jdk_version == z.jdk_version x.suite == z.suite) // exclude self build and build for other suites. + .filter(z => x != z && x.jdk_version == z.jdk_version && x.suite == z.suite) // exclude self build and build for other suites. .map(z => z.revision) // map from array of build to array of revision .includes(x.revision) // check if revision of x is index data. ).concat(data.filter(x => x.hasOwnProperty('merge'))); // concat unique build with merged build.