Changeset 15183

Timestamp:

11/21/19 20:15:11 (4 years ago)

Author:

Mark Evenson

Message:

ci: more fixes for jenv installation

Location:

trunk/abcl/ci

Files:

• install-adoptjdk.bash (modified) (2 diffs)
• install-jenv.bash (modified) (1 diff)

trunk/abcl/ci/install-adoptjdk.bash

@@ -66 +66 @@
 
 function set_jdk() {
+    jenv versions
+
+    case ${ABCL_JDK} in
+        openjdk8)
+            version=$(jenv versions | grep openjdk | grep 1.8 | tail -1 | sed s/*//)
+            ;;
+        openjdk11)
+            version=$(jenv versions | grep openjdk | grep 11.0 | tail -1 | sed s/*//)
+            ;;
+    esac
+
     pushd ${TRAVIS_BUILD_DIR}
 
-    # ideally, this should be enough
-    jenv version ${ABCL_JDK}
+    jenv local ${version}
     # but practically we guard every invocation of jenv this way
-    jenv global ${ABCL_JDK}
+    jenv global ${version}
 
     popd
@@ -81 +91 @@
 set_jdk
 
+
+
+

trunk/abcl/ci/install-jenv.bash

@@ -14 +14 @@
 
 jenv enable-plugin ant
-jenv enanle-plugin maven
+jenv enable-plugin maven
 
 jenv doctor