From 15ab81f7dce1d522842c9271459f9cf46f8d3683 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Tue, 9 Jul 2024 10:31:42 +0200 Subject: [PATCH 1/2] [GR-55163] Do not use SIGKILL on windows The SIGKILL attribute does not exist in the signal module. Calling terminate on the process seems to be the best we can do --- src/mx/_impl/mx.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index 7e73fbec..fe18fd51 100755 --- a/src/mx/_impl/mx.py +++ b/src/mx/_impl/mx.py @@ -7728,7 +7728,10 @@ def redirect(stream): raise RuntimeError(f'Error starting {myself}: returncode={returncode}\n{"".join(pout)}') if retries == 299: warn(f'Killing {myself} after failing to see port number after nearly 30 seconds') - os.kill(p.pid, signal.SIGKILL) + if is_windows(): + p.terminate() + else: + os.kill(p.pid, signal.SIGKILL) time.sleep(1.0) elif retries > 300: raise RuntimeError(f'Error starting {myself}: No port number was found in output after 30 seconds\n{"".join(pout)}') @@ -18195,7 +18198,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.27.5") # mergetool conflict marker fix +version = VersionSpec("7.27.6") # GR-55163 _mx_start_datetime = datetime.utcnow() From 92c1a19d6eb623d5609dc0fc073d4e52b6e3d19b Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Tue, 9 Jul 2024 14:52:56 +0200 Subject: [PATCH 2/2] Sync common.json --- common.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/common.json b/common.json index efedd632..18b166ff 100644 --- a/common.json +++ b/common.json @@ -4,11 +4,11 @@ "Jsonnet files should not include this file directly but use ci/common.jsonnet instead." ], - "mx_version": "7.27.1", + "mx_version": "7.27.5", "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet", "jdks": { - "galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+2-53", "platformspecific": true, "extrabundles": ["static-libs"]}, + "galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+5-437", "platformspecific": true, "extrabundles": ["static-libs"]}, "oraclejdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "jdk-11.0.11+9", "platformspecific": true, "extrabundles": ["static-libs"] }, @@ -45,13 +45,13 @@ "labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true }, "graalvm-ee-21": {"name": "graalvm-java21", "version": "23.1.3", "platformspecific": true }, - "oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+3", "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+3-jvmci-b01", "platformspecific": true }, - "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+3-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+3-jvmci-b01-sulong", "platformspecific": true }, - "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+3-jvmci-b01", "platformspecific": true }, - "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+3-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+3-jvmci-b01-sulong", "platformspecific": true } + "oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+5", "platformspecific": true, "extrabundles": ["static-libs"]}, + "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+5-jvmci-b01", "platformspecific": true }, + "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+5-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+5-jvmci-b01-sulong", "platformspecific": true }, + "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+5-jvmci-b01", "platformspecific": true }, + "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+5-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+5-jvmci-b01-sulong", "platformspecific": true } }, "eclipse": {