Fix jt install jvmci before cloning graal

Author: eregon

.github/actions/setup-jvmci-graal/action.yml

@@ -2,6 +2,11 @@ name: 'Install JVMCI, set JAVA_HOME and clone Graal'
 runs:
   using: "composite"
   steps:
+    - name: Clone Graal
+      run: jt sforceimports
+      shell: bash
+      working-directory: ${{ github.action_path }}
+
     - name: Install JVMCI
       run: jt install jvmci
       shell: bash
@@ -11,8 +16,3 @@ runs:
       run: echo "JAVA_HOME=$(jt install jvmci)" >> $GITHUB_ENV
       shell: bash
       working-directory: ${{ github.action_path }}
-
-    - name: Clone Graal
-      run: jt mx sforceimports
-      shell: bash
-      working-directory: ${{ github.action_path }}

tool/jt.rb

@@ -186,6 +186,7 @@ def graal_common_json
 
   def jvmci_version
     @jvmci_version ||= begin
+      sforceimports unless File.directory?(GRAAL_DIR)
       common_json = File.read(graal_common_json)
       edition = ee_jdk? ? 'ee' : 'ce'
       regex = /"labsjdk-#{edition}-#{@jdk_version}":\s*\{\s*"name":\s*"labsjdk"\s*,\s*"version":\s*"[^"]+-(jvmci-[^"]+)"\s*,/
@@ -2509,6 +2510,10 @@ def bootstrap_toolchain
     end
   end
 
+  def sforceimports
+    mx('sforceimports', java_home: :none, primary_suite: TRUFFLERUBY_DIR)
+  end
+
   private def build_graalvm(*options)
     raise 'use --env jvm-ce instead' if options.delete('--graal')
     raise 'use --env native instead' if options.delete('--native')
@@ -2544,14 +2549,14 @@ def bootstrap_toolchain
     checkout_enterprise_revision(env) if cloned
 
     if options.delete('--sforceimports') || sforceimports?(mx_base_args)
-      mx('sforceimports', java_home: :none, primary_suite: TRUFFLERUBY_DIR)
+      sforceimports
       if ee
         checkout_enterprise_revision(env) if !cloned
         # sforceimports for optional suites imported in vm-enterprise like substratevm-enterprise-gcs
         vm_enterprise = File.expand_path '../graal-enterprise/vm-enterprise', TRUFFLERUBY_DIR
         mx('--env', env_path(env), 'sforceimports', java_home: :none, primary_suite: vm_enterprise)
         # And still make sure we import the graal revision as in mx.truffleruby/suite.py
-        mx('sforceimports', java_home: :none, primary_suite: TRUFFLERUBY_DIR)
+        sforceimports
       end
     end