[GR-18411] Update to latest Truffle and jt lint fast improvements.

PullRequest: truffleruby/1746

Author: eregon

common.json

@@ -2,14 +2,14 @@
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
 
   "jdks": {
-    "oraclejdk8":      {"name": "oraclejdk", "version": "8u251+08-jvmci-20.1-b02", "platformspecific": true },
-    "openjdk8":        {"name": "openjdk",   "version": "8u252+09-jvmci-20.1-b02", "platformspecific": true },
-    "oraclejdk8Debug": {"name": "oraclejdk", "version": "8u251+08-jvmci-20.1-b02-fastdebug", "platformspecific": true },
+    "oraclejdk8":      {"name": "oraclejdk", "version": "8u251+08-jvmci-20.2-b02", "platformspecific": true },
+    "openjdk8":        {"name": "openjdk",   "version": "8u252+09-jvmci-20.2-b02", "platformspecific": true },
+    "oraclejdk8Debug": {"name": "oraclejdk", "version": "8u251+08-jvmci-20.2-b02-fastdebug", "platformspecific": true },
     "oraclejdk11":     {"name": "oraclejdk", "version": "11.0.6+8", "platformspecific": true },
     "oraclejdk15":     {"name": "oraclejdk", "version": "15+27", "platformspecific": true },
     "openjdk11":       {"name": "openjdk",   "version": "11.0.3+7", "platformspecific": true },
-    "labsjdk-ce-11":   {"name": "labsjdk",   "version": "ce-11.0.7+10-jvmci-20.1-b02", "platformspecific": true },
-    "labsjdk-ee-11":   {"name": "labsjdk",   "version": "ee-11.0.7+8-jvmci-20.1-b02", "platformspecific": true }
+    "labsjdk-ce-11":   {"name": "labsjdk",   "version": "ce-11.0.7+10-jvmci-20.2-b02", "platformspecific": true },
+    "labsjdk-ee-11":   {"name": "labsjdk",   "version": "ee-11.0.7+8-jvmci-20.2-b02", "platformspecific": true }
   },
 
   "sulong": {

mx.truffleruby/suite.py

@@ -7,7 +7,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "3eec42fde4bbdc2c4c36f1dcd44098e968c4feac",
+                "version": "89aaf872689d47977073e0b87f7e12c8f28bc44e",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

tool/jt.rb

@@ -1404,7 +1404,7 @@ def gem_test_pack
     # Unset variable set by the pre-commit hook which confuses git
     env = { 'GIT_DIR' => nil, 'GIT_INDEX_FILE' => nil }
 
-    current = raw_sh(env, 'git', '-C', gem_test_pack, 'rev-parse', 'HEAD', capture: :out).chomp
+    current = raw_sh(env, 'git', '-C', gem_test_pack, 'rev-parse', 'HEAD', capture: :out, no_print_cmd: true).chomp
     unless current == TRUFFLERUBY_GEM_TEST_PACK_VERSION
       has_commit = raw_sh env, 'git', '-C', gem_test_pack, 'cat-file', '-e', TRUFFLERUBY_GEM_TEST_PACK_VERSION, continue_on_failure: true
       unless has_commit
@@ -1841,7 +1841,7 @@ def install(name, *options)
       dir_pattern = "#{dir}/openjdk1.8.0*#{jvmci_version}"
       if Dir[dir_pattern].empty?
         STDERR.puts download_message
-        jvmci_releases = 'https://github.com/graalvm/openjdk8-jvmci-builder/releases/download'
+        jvmci_releases = 'https://github.com/graalvm/graal-jvmci-8/releases/download'
         filename = "openjdk-8u#{update}-#{jvmci_version}-#{mx_os}-amd64.tar.gz"
         chdir(dir) do
           raw_sh 'curl', '-L', "#{jvmci_releases}/#{jvmci_version}/#{filename}", '-o', filename
@@ -1879,6 +1879,8 @@ def install(name, *options)
 
     eclipse_tar = eclipse_url.split('/').last
     eclipse_name = File.basename(eclipse_tar, '.tar.gz')
+    eclipse_path = File.expand_path("../#{eclipse_name}/#{eclipse_exe}", TRUFFLERUBY_DIR)
+    return eclipse_path if File.exist?(eclipse_path)
 
     dir = File.expand_path('..', TRUFFLERUBY_DIR)
     chdir(dir) do
@@ -1896,7 +1898,7 @@ def install(name, *options)
       end
     end
 
-    File.expand_path("../#{eclipse_name}/#{eclipse_exe}", TRUFFLERUBY_DIR)
+    eclipse_path
   end
 
   def clone_enterprise
@@ -2078,11 +2080,7 @@ def rubocop(*args)
 
     if gem_test_pack?
       gem_home = "#{gem_test_pack}/rubocop-gems"
-      env = {
-        'GEM_HOME' => gem_home,
-        'GEM_PATH' => gem_home,
-        'PATH' => "#{gem_home}/bin:#{ENV['PATH']}"
-      }
+      env = { 'GEM_HOME' => gem_home, 'GEM_PATH' => gem_home }
       sh env, 'ruby', "#{gem_home}/bin/rubocop", *args
     else
       sh 'rubocop', '_0.66.0_', *args
@@ -2381,8 +2379,18 @@ def format_specializations_arguments
 
   def lint(*args)
     fast = args.first == 'fast'
-    fast_exts_changed = fast ? `git diff --cached --name-only`.lines.map { |f| File.extname(f.strip) }.uniq : []
-    changed = ->(ext) { !fast or fast_exts_changed.include?(ext) }
+    if fast
+      changed_files = `git diff --cached --name-only` # Only staged files in the git index
+      if changed_files.empty? # post-commit hook
+        changed_files = `git diff --cached --name-only HEAD^`
+      end
+      raise 'Could not list changed files' if changed_files.empty?
+      exts_changed = changed_files.lines.map { |f| File.extname(f.strip) }.uniq
+      raise 'Could not list changed file extensions' if exts_changed.empty?
+      changed = -> ext { exts_changed.include?(ext) }
+    else
+      changed = -> _ext { true }
+    end
 
     ENV['ECLIPSE_EXE'] ||= install_eclipse