[GR-29847] Symlink instead of copying the built GraalVM

PullRequest: truffleruby/2477

Author: eregon

ci.jsonnet

@@ -75,7 +75,7 @@ local part_definitions = {
       environment+: { path+:: ["$MAVEN_HOME/bin"] },
     },
 
-    build_no_clean: {
+    build: {
       setup+: [["mx", "sversions"]] +
               # aot-build.log is used for the build-stats metrics, in other cases it does no harm
               jt(["build", "--env", self.mx_env, "--"] + self.mx_build_options + ["|", "tee", "aot-build.log"]) +
@@ -85,13 +85,6 @@ local part_definitions = {
               ],
     },
 
-    clean: {
-      # Clean build results to make sure nothing refers to them while testing
-      setup+: [["mx", "--env", self.mx_env, "clean"]],
-    },
-
-    build: $.use.build_no_clean + $.use.clean,
-
     truffleruby: {
       "$.benchmark.server":: { options: [] },
       environment+: {
@@ -294,13 +287,7 @@ local part_definitions = {
   },
 
   run: {
-    clean: {
-      # $.use.clean but as run instead of setup
-      run+: [["mx", "--env", self.mx_env, "clean"]],
-    },
-
     test_unit_tck: {
-      # Run unittests first before cleaning, they need a full non-cleaned build
       run+: jt(["test", "unit", "--verbose"]) +
             jt(["test", "tck"])
     },
@@ -324,7 +311,7 @@ local part_definitions = {
     },
 
     lint: {
-      is_after:: ["$.use.build_no_clean"],
+      is_after:: ["$.use.build"],
       downloads+: {
         JDT: { name: "ecj", version: "4.14.0", platformspecific: false },
         ECLIPSE: { version: "4.5.2", name: "eclipse", platformspecific: true },
@@ -482,7 +469,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
 
   test_builds:
     {
-      "ruby-lint": $.platform.linux + $.cap.gate + $.jdk.v11 + $.use.common + $.env.jvm + $.use.build_no_clean + $.run.lint + { timelimit: "30:00" },
+      "ruby-lint": $.platform.linux + $.cap.gate + $.jdk.v11 + $.use.common + $.env.jvm + $.use.build + $.run.lint + { timelimit: "30:00" },
       # Run specs on MRI to make sure new specs are compatible and have the needed version guards
       "ruby-test-specs-mri": $.platform.linux + $.cap.gate + $.use.common + $.run.test_specs_mri + { timelimit: "30:00" },
     } +
@@ -494,10 +481,10 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
       local native_tests = $.run.testdownstream_aot + $.run.test_integration + $.run.test_compiler,
 
       // Order: platform, jdk, mx_env. Keep aligned for an easy visual comparison.
-      "ruby-test-specs-linux-8":     $.platform.linux  + $.jdk.v8  + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "50:00" },
-      "ruby-test-specs-linux-11":    $.platform.linux  + $.jdk.v11 + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "50:00" },
-      "ruby-test-specs-darwin-8":    $.platform.darwin + $.jdk.v8  + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "01:35:00" },
-      "ruby-test-specs-darwin-11":   $.platform.darwin + $.jdk.v11 + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "01:35:00" },
+      "ruby-test-specs-linux-8":     $.platform.linux  + $.jdk.v8  + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "50:00" },
+      "ruby-test-specs-linux-11":    $.platform.linux  + $.jdk.v11 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "50:00" },
+      "ruby-test-specs-darwin-8":    $.platform.darwin + $.jdk.v8  + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:35:00" },
+      "ruby-test-specs-darwin-11":   $.platform.darwin + $.jdk.v11 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:35:00" },
       "ruby-test-fast-linux-arm64":  $.platform.linux_arm64 + $.jdk.v11 + $.env.jvm + gate + $.run.test_fast + native_config + { timelimit: "30:00" },
       "ruby-test-fast-linux":        $.platform.linux  + $.jdk.v11 + $.env.jvm + gate + $.run.test_fast + { timelimit: "30:00" },  # To catch missing slow tags
       "ruby-test-mri-linux":         $.platform.linux  + $.jdk.v11 + $.env.jvm + gate + $.run.test_mri + { timelimit: "45:00" },

tool/jt.rb

@@ -195,20 +195,18 @@ def ruby_launcher
     @ruby_name ||= ENV['RUBY_BIN'] || 'jvm'
     ruby_launcher = if @ruby_name == 'ruby'
                       ENV['RBENV_ROOT'] ? `rbenv which ruby`.chomp : which('ruby')
-                    elsif File.executable?(@ruby_name) and File.file?(@ruby_name)
-                      @ruby_name
-                    elsif @ruby_name.start_with?('/') and File.directory?(@ruby_name)
-                      "#{@ruby_name}/bin/ruby"
+                    elsif @ruby_name.start_with?('/')
+                      File.directory?(@ruby_name) ? "#{@ruby_name}/bin/ruby" : @ruby_name
                     else
                       graalvm = "#{TRUFFLERUBY_DIR}/mxbuild/truffleruby-#{@ruby_name}"
                       "#{graalvm}/#{language_dir(graalvm)}/ruby/bin/ruby"
                     end
 
     raise "The Ruby executable #{ruby_launcher} does not exist" unless File.exist?(ruby_launcher)
-    ruby_launcher = File.realpath(ruby_launcher)
-
     raise "The Ruby executable #{ruby_launcher} is not executable" unless File.executable?(ruby_launcher)
+
     @ruby_launcher = ruby_launcher
+    @ruby_launcher_realpath = File.realpath(ruby_launcher)
 
     unless @silent
       shortened_path = @ruby_launcher.sub(%r[^#{Regexp.escape TRUFFLERUBY_DIR}/], '').sub(%r[/bin/(ruby|truffleruby)$], '')
@@ -222,13 +220,14 @@ def ruby_launcher
 
     # use same ruby_launcher in subprocess jt instances
     # cannot be set while building
-    ENV['RUBY_BIN'] = ruby_launcher
+    ENV['RUBY_BIN'] = @ruby_launcher
     @ruby_launcher
   end
   alias_method :require_ruby_launcher!, :ruby_launcher
 
   def ruby_home
-    File.expand_path('../..', ruby_launcher)
+    require_ruby_launcher!
+    File.expand_path('../..', @ruby_launcher_realpath)
   end
 
   def graalvm_home
@@ -280,7 +279,8 @@ def truffleruby?
   end
 
   def truffleruby_launcher_path
-    @truffleruby_launcher_path ||= File.join File.dirname(ruby_launcher), 'truffleruby'
+    require_ruby_launcher!
+    @truffleruby_launcher_path ||= File.expand_path('../truffleruby', @ruby_launcher_realpath)
   end
 
   def truffleruby!
@@ -2170,11 +2170,11 @@ def bootstrap_toolchain
     dest_ruby = "#{dest}/#{language_dir(build_dir)}/ruby"
     dest_bin = "#{dest_ruby}/bin"
     FileUtils.rm_rf dest
-    FileUtils.cp_r build_dir, dest
+    File.symlink(build_dir, dest)
 
     # Insert native wrapper around the bash launcher
     # since nested shebang does not work on macOS when fish shell is used.
-    if darwin? && !truffleruby_native?
+    if darwin? && File.binread(truffleruby_launcher_path)[2] == '#!'
       FileUtils.mv "#{dest_bin}/truffleruby", "#{dest_bin}/truffleruby.sh"
       FileUtils.cp "#{TRUFFLERUBY_DIR}/tool/native_launcher_darwin", "#{dest_bin}/truffleruby"
     end