File tree 1 file changed +4
-1
lines changed
1 file changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -7,12 +7,15 @@ before_install:
7
7
echo sdkman_auto_selfupdate=true >> $HOME/.sdkman/etc/config
8
8
source $HOME/.sdkman/bin/sdkman-init.sh
9
9
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
10
13
sdk install java $sdkJava || true # install fails if it's already installed
11
14
sdk use java $sdkJava
12
15
unset JAVA_HOME
13
16
if [[ $ADOPTOPENJDK == 8 ]]; then versionPrefix="1\.8"; else versionPrefix=$ADOPTOPENJDK; fi
14
17
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
16
19
# Travis-CI has (as of March 2021, anyway) an outdated sbt-extras version,
17
20
# so overwrite it with a March 2021 version that works with sbt 1.4.8+
18
21
- |
You can’t perform that action at this time.
0 commit comments