Skip to content

Commit 2f45de3

Browse files
chrisseatonansalond
authored andcommitted
Accommodate ce/ee prefix, and build suffix, in tarballs
(cherry picked from commit 30d4919)
1 parent 2e5987e commit 2f45de3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

tool/jt.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2001,7 +2001,11 @@ def dockerfile(*args)
20012001
graalvm_component = File.basename(graalvm_component)
20022002
lines.push "COPY #{graalvm_tarball} /test/"
20032003
lines.push "COPY #{graalvm_component} /test/"
2004-
graalvm_version = /\d+(\.\d+)*(-rc\d+)?(\-dev)?(-\h+)?/.match(graalvm_tarball).to_s
2004+
graalvm_version = /([ce]e-)?\d+(\.\d+)*(-rc\d+)?(\-dev)?(-\h+)?/.match(graalvm_tarball).to_s
2005+
2006+
# Test build tarballs may have a -bn suffix, which isn't really part of the version string but matches the hex part in some cases
2007+
graalvm_version = graalvm_version.gsub(/-b\d+\Z/, '')
2008+
20052009
lines.push "RUN tar -zxf #{graalvm_tarball}"
20062010
lines.push "ENV D_GRAALVM_BASE=/test/graalvm-#{graalvm_version}"
20072011
lines.push "RUN $D_GRAALVM_BASE/bin/gu install --file /test/#{graalvm_component}"

0 commit comments

Comments
 (0)