From 5ddc5865ca6b272b2e68837c96d3c4c114375a8d Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Sat, 3 Feb 2024 12:32:03 +0100
Subject: [PATCH 1/3] Simplify: `jt build` now only builds what is needed

---
 .github/workflows/truffleruby.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/truffleruby.yml b/.github/workflows/truffleruby.yml
index 7f9993beba..d9197c3ac7 100644
--- a/.github/workflows/truffleruby.yml
+++ b/.github/workflows/truffleruby.yml
@@ -59,11 +59,8 @@ jobs:
         path: truffleruby-ws/graal
         ref: ${{ steps.graal_commit.outputs.graal_commit }}
 
-    - name: Download dependencies
-      run: jt -q mx --env jvm graalvm-dist-name
-      working-directory: truffleruby-ws/truffleruby
     - name: Build TruffleRuby
-      run: jt build -- --dependencies "$(jt -q mx --env jvm graalvm-dist-name)"
+      run: jt build
       working-directory: truffleruby-ws/truffleruby
 
     - name: Parse test/prism/fixtures/**/*.rb

From 2d0c64bdeaf6d05d195b771aafd025cd5e65226d Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Sat, 3 Feb 2024 12:36:39 +0100
Subject: [PATCH 2/3] Update truffleruby workflow to use newer APIs now that
 Prism is default

---
 .github/workflows/truffleruby.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/truffleruby.yml b/.github/workflows/truffleruby.yml
index d9197c3ac7..790ccc86c7 100644
--- a/.github/workflows/truffleruby.yml
+++ b/.github/workflows/truffleruby.yml
@@ -64,12 +64,8 @@ jobs:
       working-directory: truffleruby-ws/truffleruby
 
     - name: Parse test/prism/fixtures/**/*.rb
-      run: jt ruby -e 'Dir.glob("test/prism/fixtures/**/*.rb") { |file| puts file; Truffle::Debug.yarp_parse(File.read(file)) }'
+      run: jt ruby -e 'Dir.glob("test/prism/fixtures/**/*.txt") { |file| puts file; puts Truffle::Debug.parse_ast(File.read(file)) }'
       working-directory: prism
 
-    - name: Parse src/main/ruby/truffleruby/**/*.rb
-      run: jt ruby -e 'Dir.glob("src/main/ruby/truffleruby/**/*.rb") { |file| puts file; Truffle::Debug.yarp_parse(File.read(file)) }'
-      working-directory: truffleruby-ws/truffleruby
-
     - name: Execute p 1+2
-      run: jt ruby -e 'Truffle::Debug.yarp_execute "p 1+2"'
+      run: jt ruby -e 'p 1+2'

From 5e0e6b78f87a05d3e67cefab6751ef56d9fb3d14 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Sat, 3 Feb 2024 12:42:20 +0100
Subject: [PATCH 3/3] Clone graal before installing JVMCI

* Because installing JVMCI now needs to have graal cloned or clones it.
---
 .github/workflows/truffleruby.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/truffleruby.yml b/.github/workflows/truffleruby.yml
index 790ccc86c7..45f421d209 100644
--- a/.github/workflows/truffleruby.yml
+++ b/.github/workflows/truffleruby.yml
@@ -45,10 +45,6 @@ jobs:
       run: tool/import-prism.sh
       working-directory: truffleruby-ws/truffleruby
 
-    - name: Install JVMCI
-      run: jt install jvmci
-    - name: Set JAVA_HOME
-      run: echo "JAVA_HOME=$(jt install jvmci)" >> $GITHUB_ENV
     - name: Get graal commit
       id: graal_commit
       run: echo "graal_commit=$(jt truffle_version)" >> $GITHUB_OUTPUT
@@ -59,6 +55,11 @@ jobs:
         path: truffleruby-ws/graal
         ref: ${{ steps.graal_commit.outputs.graal_commit }}
 
+    - name: Install JVMCI
+      run: jt install jvmci
+    - name: Set JAVA_HOME
+      run: echo "JAVA_HOME=$(jt install jvmci)" >> $GITHUB_ENV
+
     - name: Build TruffleRuby
       run: jt build
       working-directory: truffleruby-ws/truffleruby