[GR-18163] Fix jt install jvmci before cloning graal

PullRequest: truffleruby/4058
oracle · Nov 16, 2023 · 3470023 · 3470023
2 parents a9afcef + 605004c
commit 3470023
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 21 deletions.
diff --git a/.github/actions/setup-jvmci-graal/action.yml b/.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 }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Clone TruffleRuby
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0 # Necessary for jt check_abi
     - name: Setup system Ruby
@@ -23,7 +23,7 @@ jobs:
       run: echo "$PWD/bin" >> $GITHUB_PATH
 
     - name: Restore ~/.mx/cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.mx/cache
         key: mx-cache-lint-${{ runner.os }}-${{ hashFiles('common.json') }}
@@ -48,7 +48,7 @@ jobs:
         working-directory: build
     steps:
     - name: Clone TruffleRuby
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: build
     - name: Setup system Ruby
@@ -59,7 +59,7 @@ jobs:
       run: echo "$PWD/bin" >> $GITHUB_PATH
 
     - name: Restore ~/.mx/cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.mx/cache
         key: mx-cache-build-${{ runner.os }}-${{ hashFiles('build/common.json') }}
@@ -89,7 +89,7 @@ jobs:
         working-directory: build
     steps:
       - name: Clone TruffleRuby
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: build
       - name: Setup system Ruby
@@ -100,7 +100,7 @@ jobs:
         run: echo "$PWD/bin" >> $GITHUB_PATH
 
       - name: Restore ~/.mx/cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.mx/cache
           key: mx-cache-build-native-${{ runner.os }}-${{ hashFiles('build/common.json') }}
@@ -131,7 +131,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Clone TruffleRuby
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Setup system Ruby
       uses: ruby/setup-ruby@v1
     - name: Setup jt
@@ -158,7 +158,7 @@ jobs:
         - :library :cext :security :command_line :tracepoint # command_line ~5min, others < 2min
     steps:
       - name: Clone TruffleRuby
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup system Ruby
         uses: ruby/setup-ruby@v1
       - name: Setup jt
@@ -177,7 +177,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Clone TruffleRuby
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup system Ruby
         uses: ruby/setup-ruby@v1
       - name: Setup jt
@@ -196,7 +196,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Clone TruffleRuby
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup system Ruby
         uses: ruby/setup-ruby@v1
       - name: Setup jt
@@ -222,7 +222,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Clone TruffleRuby
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup system Ruby
         uses: ruby/setup-ruby@v1
       - name: Setup jt
@@ -245,7 +245,7 @@ jobs:
         ruby: ['3.0', '3.1', '3.2']
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

diff --git a/doc/user/testing-truffleruby-in-ci.md b/doc/user/testing-truffleruby-in-ci.md
@@ -18,10 +18,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.6, truffleruby, truffleruby-head ]
+        ruby: [ '3.2', truffleruby, truffleruby-head ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

diff --git a/tool/jt.rb b/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*,/
@@ -2512,6 +2513,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')
@@ -2547,14 +2552,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