@@ -143,19 +143,14 @@ def get_truffle_version(from: :suite)
143
143
end
144
144
end
145
145
146
- def jvmci_update_and_version
147
- if env = ENV [ 'JVMCI_VERSION' ]
148
- unless /8u(\d +(?:\+ \d +)?)-(jvmci-\d +\. \d +-b\d +)/ =~ env
149
- raise 'Could not parse JDK update and JVMCI version from $JVMCI_VERSION'
150
- end
151
- else
146
+ def jvmci_version
147
+ @jvmci_version ||= begin
152
148
ci = File . read ( "#{ TRUFFLERUBY_DIR } /common.json" )
153
- unless /{\s *"name"\s *:\s *"openjdk"\s *,\s *"version"\s *:\s *"8u(\d +(?:\+ \d +)?)-(jvmci-[^"]+)"\s *,/ =~ ci
149
+ unless /{\s *"name"\s *:\s *"openjdk"\s *,\s *"version"\s *:\s *"8u(?: \d +(?:\+ \d +)?)-(jvmci-[^"]+)"\s *,/ =~ ci
154
150
raise 'JVMCI version not found in common.json'
155
151
end
152
+ $1
156
153
end
157
- update , jvmci = $1, $2
158
- [ update , jvmci ]
159
154
end
160
155
161
156
def send_signal ( signal , pid )
@@ -518,7 +513,6 @@ def find_java_home
518
513
end
519
514
java_home ||= ENV [ 'JAVA_HOME' ]
520
515
521
- _ , jvmci_version = jvmci_update_and_version
522
516
if java_home
523
517
if java_home . include? ( jvmci_version )
524
518
:use_env_java_home
@@ -1939,7 +1933,6 @@ def install(name, *options)
1939
1933
private def install_jvmci ( download_message , ee )
1940
1934
jdk_name = ee ? 'oraclejdk8' : 'openjdk8'
1941
1935
1942
- _ , jvmci_version = jvmci_update_and_version
1943
1936
java_home = "#{ CACHE_EXTRA_DIR } /#{ jdk_name } -#{ jvmci_version } "
1944
1937
unless File . directory? ( java_home )
1945
1938
STDERR . puts "#{ download_message } (#{ jdk_name } )"
0 commit comments