From 28add3de264db6e11417edd585dc0c1c794972d5 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Wed, 10 Jan 2024 12:17:38 +0100 Subject: [PATCH 1/2] If the vc dir is computed via marker files, the VC is None. Else we might return the VC of a less nested directory. --- src/mx/_impl/mx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index d7b4e429..e4f15e98 100755 --- a/src/mx/_impl/mx.py +++ b/src/mx/_impl/mx.py @@ -1378,7 +1378,7 @@ def get_vc(candidate_root_dir): candidate_root_dir = dirname(candidate_root_dir) # Return the match with the "deepest nesting" - return vc, vc_dir if len(vc_dir or '') > len(marked_root_dir or '') else marked_root_dir + return (vc, vc_dir) if len(vc_dir or '') >= len(marked_root_dir or '') else (None, marked_root_dir) @staticmethod def siblings_dir(suite_dir): From 90a65509e90456f3b396b1249352df4ba778b32e Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Wed, 10 Jan 2024 12:23:14 +0100 Subject: [PATCH 2/2] Update mx version and sync common CI files. --- common.json | 14 +++++++------- src/mx/_impl/mx.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common.json b/common.json index 9757335d..3de32351 100644 --- a/common.json +++ b/common.json @@ -44,13 +44,13 @@ "labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21.0.1+11-jvmci-23.1-b26-debug", "platformspecific": true }, "labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21.0.1+11-jvmci-23.1-b26-sulong", "platformspecific": true }, - "oraclejdk-latest": {"name": "jpg-jdk", "version": "23", "build_id": "2", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-23+2-jvmci-b01", "platformspecific": true }, - "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-23+2-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-23+2-jvmci-b01-sulong", "platformspecific": true }, - "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-23+2-jvmci-b01", "platformspecific": true }, - "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-23+2-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-23+2-jvmci-b01-sulong", "platformspecific": true } + "oraclejdk-latest": {"name": "jpg-jdk", "version": "23", "build_id": "4", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}, + "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-23+4-jvmci-b01", "platformspecific": true }, + "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-23+4-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-23+4-jvmci-b01-sulong", "platformspecific": true }, + "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-23+4-jvmci-b01", "platformspecific": true }, + "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-23+4-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-23+4-jvmci-b01-sulong", "platformspecific": true } }, "eclipse": { diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index e4f15e98..b9a5f803 100755 --- a/src/mx/_impl/mx.py +++ b/src/mx/_impl/mx.py @@ -19255,7 +19255,7 @@ def alarm_handler(signum, frame): abort(1, killsig=signal.SIGINT) # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue -version = VersionSpec("7.6.0") # [GR-51173] Improve computation of suite root dirs. +version = VersionSpec("7.6.1") # [GR-51173] Fix computation of suite root dirs. _mx_start_datetime = datetime.utcnow() _last_timestamp = _mx_start_datetime