Skip to content

Commit

Permalink
Merge pull request oracle#106 from Shopify/rm-fix-graal-path-on-jt
Browse files Browse the repository at this point in the history
Point to our fork of graal on jt

Merge-Requested-By: rafaelfranca
Merge-Queue-Digest: 5086b6fbf6fa3b11a9406903a500642ab948d7cc850b6becb25692c13d312128
  • Loading branch information
shopify-shipitnext[bot] authored Oct 30, 2019
2 parents d348597 + c88f4ac commit 7c49788
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tool/jt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 7c49788

Please sign in to comment.