Skip to content

Commit 1a7c0e6

Browse files
committed
JDK selection: allow non-Adopt early access builds
so e.g. at the moment ADOPTOPENJDK=17 will get us 17.ea.28-open
1 parent 52a1cc0 commit 1a7c0e6

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

travis/default.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@ before_install:
77
echo sdkman_auto_selfupdate=true >> $HOME/.sdkman/etc/config
88
source $HOME/.sdkman/bin/sdkman-init.sh
99
sdkJava=$(sdk list java | grep -o " $ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1 | cut -c2-)
10+
# if we didn't find AdoptOpenJDK, accept a non-Adopt early access build
11+
if [[ -z $sdkJava ]]; then sdkJava=$(sdk list java | egrep -o " $ADOPTOPENJDK\\.ea.[0-9]+-open" | head -1 | cut -c2-); fi
12+
if [[ -z $sdkJava ]]; then echo "no matching JDK found: $ADOPTOPENJDK"; travis_terminate 1; fi
1013
sdk install java $sdkJava || true # install fails if it's already installed
1114
sdk use java $sdkJava
1215
unset JAVA_HOME
1316
if [[ $ADOPTOPENJDK == 8 ]]; then versionPrefix="1\.8"; else versionPrefix=$ADOPTOPENJDK; fi
1417
java -version
15-
- java -version 2>&1 | grep 'AdoptOpenJDK.*[^0-9]'$versionPrefix'[^0-9]' || exit 1
18+
- java -version 2>&1 | grep 'OpenJDK.*[^0-9]'$versionPrefix'[^0-9]' || exit 1
1619
# Travis-CI has (as of March 2021, anyway) an outdated sbt-extras version,
1720
# so overwrite it with a March 2021 version that works with sbt 1.4.8+
1821
- |

0 commit comments

Comments
 (0)