Skip to content

Commit

Permalink
support Java versions Java 9 or later
Browse files Browse the repository at this point in the history
  • Loading branch information
tagomoris committed Dec 18, 2019
1 parent bb0f0dd commit 2bbf98c
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions lib/td/command/workflow.rb
Original file line number Diff line number Diff line change
Expand Up @@ -246,14 +246,20 @@ def detect_system_java
return false
end
if output =~ /openjdk version/ or output =~ /java version/
m = output.match(/version "(\d+)\.(\d+)\.(\d+)(?:_(\d+))"/)
m = output.match(/version "(\d+)\.(\d+)\.(\d+)(?:_(\d+))?"/)
if not m or m.size < 4
return false
end
# Check for at least Java 8. Let digdag itself verify revision.
major = m[1].to_i
minor = m[2].to_i
if major < 1 or minor < 8
# Check for at least Java 8. Let digdag itself verify revision.
if major < 1
return false
elsif major == 1 # suppose the version style: 1.8.10_52 (JDK8 and before)
if minor < 8
return false
end
elsif major < 9 # suppose the version style: 11.0.2
return false
end
end
Expand Down

0 comments on commit 2bbf98c

Please sign in to comment.