diff --git a/common.json b/common.json index 467c4edf..90d2993f 100644 --- a/common.json +++ b/common.json @@ -4,7 +4,7 @@ "Jsonnet files should not include this file directly but use ci/common.jsonnet instead." ], - "mx_version": "7.29.5", + "mx_version": "7.29.6", "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet", "jdks": { diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index def98502..2a333ad9 100755 --- a/src/mx/_impl/mx.py +++ b/src/mx/_impl/mx.py @@ -18196,7 +18196,7 @@ def alarm_handler(signum, frame): _CACHE_DIR = get_env('MX_CACHE_DIR', join(dot_mx_dir(), 'cache')) # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue -version = VersionSpec("7.29.6") # GR-56803 +version = VersionSpec("7.29.7") # GR-57947 replace misstyped 'raise' with 'return' _mx_start_datetime = datetime.utcnow() diff --git a/src/mx/_impl/mx_benchmark.py b/src/mx/_impl/mx_benchmark.py index 08f0080c..67c29412 100644 --- a/src/mx/_impl/mx_benchmark.py +++ b/src/mx/_impl/mx_benchmark.py @@ -1957,7 +1957,7 @@ def run_java(self, args, out=None, err=None, cwd=None, nonZeroIsFatal=False): def home(self): """Returns the JAVA_HOME location of that vm""" - raise mx.get_jdk().home + return mx.get_jdk().home def run_vm(self, args, out=None, err=None, cwd=None, nonZeroIsFatal=False): self.extract_vm_info(args)