From c88f4ac14eaecac49173cf0a80eb028db867f06b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 30 Oct 2019 15:35:51 -0400 Subject: [PATCH] Point to our fork of graal on jt --- tool/jt.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tool/jt.rb b/tool/jt.rb index 734102de3225..0f0711117464 100755 --- a/tool/jt.rb +++ b/tool/jt.rb @@ -129,7 +129,7 @@ def get_truffle_version(from: :suite) raise unless /"name": "tools",.+?"version": "(\h{40})"/m =~ suite $1 when :repository - raw_sh('git', 'rev-parse', 'HEAD', capture: true, no_print_cmd: true, chdir: File.join(TRUFFLERUBY_DIR, '..', 'graal')).chomp + raw_sh('git', 'rev-parse', 'HEAD', capture: true, no_print_cmd: true, chdir: File.join(TRUFFLERUBY_DIR, '..', 'graal-shopify')).chomp else raise ArgumentError, from: from end @@ -1879,7 +1879,7 @@ def install(name, *options) def checkout_enterprise_revision ee_path = File.expand_path File.join(TRUFFLERUBY_DIR, '..', 'graal-enterprise') - graal_path = File.expand_path File.join(TRUFFLERUBY_DIR, '..', 'graal') + graal_path = File.expand_path File.join(TRUFFLERUBY_DIR, '..', 'graal-shopify') unless File.directory?(ee_path) github_ee_url = 'https://github.com/graalvm/graal-enterprise.git' bitbucket_ee_url = raw_sh('mx', 'urlrewrite', github_ee_url, capture: true).chomp @@ -1905,7 +1905,7 @@ def checkout_enterprise_revision end def bootstrap_toolchain - sulong_home = File.join(TRUFFLERUBY_DIR, '..', 'graal', 'sulong') + sulong_home = File.join(TRUFFLERUBY_DIR, '..', 'graal-shopify', 'sulong') # clone the graal repository if it is missing mx 'sversions' unless File.directory? sulong_home graal_version = get_truffle_version from: :repository