[GR-71954] Fix SafeDirectoryUpdater when running in a layered container build.

PullRequest: mx/1994

Author: rschatz

ci.jsonnet

@@ -160,7 +160,7 @@ local with(platform, java_release, timelimit="15:00") = {
         ],
     },
 
-    build_graalvm_ce:: self.with_name("gate-build-graalvm-ce") + common.deps.sulong + common.deps.truffleruby + {
+    build_graalvm_ce:: self.with_name("gate-build-graalvm-ce") + common.deps.sulong + {
         packages+: {
             make: ">=" + versions.make,
         },
@@ -169,10 +169,6 @@ local with(platform, java_release, timelimit="15:00") = {
         ] + self.java_home_in_env("../graal/vm", "vm") + [
             # Test the ce env file
             [mx, "-p", "../graal/vm", "--env", "ce", "build"],
-            # Also test building Truffle languages
-            [mx, "-p", "../graal/vm", "--dy", "truffleruby", "sforceimports"],
-            [mx, "-p", "../graal/vm", "--dy", "truffleruby", "--env", "../../../truffleruby/mx.truffleruby/native", "graalvm-show"],
-            [mx, "-p", "../graal/vm", "--dy", "truffleruby", "--env", "../../../truffleruby/mx.truffleruby/native", "build"],
         ],
     },
 

ci/common.jsonnet

@@ -286,18 +286,6 @@ local common_json = import "../common.json";
       } else {},
     },
 
-    truffleruby:: {
-      packages+: (if self.os == "linux" && self.arch == "amd64" then {
-        ruby: "==3.2.2", # Newer version, also used for benchmarking
-      } else if (self.os == "windows") then
-        error('truffleruby is not supported on windows')
-      else {
-        ruby: "==3.0.2",
-      }) + (if self.os == "linux" then {
-        libyaml: "==0.2.5",
-      } else {}),
-    },
-
     graalnodejs:: {
       local this = self,
       packages+: if self.os == "linux" then {

common.json

@@ -49,12 +49,12 @@
     "graalvm-ee-25-ea":   {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },
 
     "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25.0.1+8", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b11", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b11-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b11-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b11", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b11-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b11-sulong", "platformspecific": true }
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b12", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b12-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b12-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b12", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b12-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b12-sulong", "platformspecific": true }
   },
 
   "eclipse": {

src/mx/_impl/mx.py

@@ -15586,6 +15586,11 @@ def __exit__(self, exc_type, exc_value, traceback):
             old_target = join(self._workspace, 'to_delete_' + basename(self.target))
             try:
                 os.rename(self.target, old_target)
+            except OSError as e:
+                if e.errno == errno.EXDEV:  # invalid cross-device link
+                    # This can happen when building a container, when the old directory isn't in the same layer as the one we are
+                    # currently building. Assume that in this case there can be no race and just rmtree instead of atomic move.
+                    rmtree(self.target)
             except:
                 # Silently assume another process won the race to rename dst_jdk_dir
                 pass

src/mx/mx_version.py

@@ -1,2 +1,2 @@
 # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue
-version = "7.68.6"  # GR-71754 - Improve sigtest help output and warn if check is run with less than "all".
+version = "7.68.7"  # GR-71954 SafeDirectoryUpdater in container