ci: moar attempts

armedbear · Mar 12, 2024 · 15bee9c · 15bee9c
1 parent decd0fa
commit 15bee9c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/ci/ensure-jenv-is-present.bash b/ci/ensure-jenv-is-present.bash
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 export JENV_ROOT=$HOME/.jenv                                                    
 if [[ $(echo $PATH | grep -c .jenv) -eq 0 ]]; then
    export PATH="$JENV_ROOT/bin:$PATH"

diff --git a/ci/install-jenv.bash b/ci/install-jenv.bash
@@ -13,7 +13,7 @@ fi
 # jenv enable-plugin maven
 # jenv enable-plugin export 
 
-jenv doctor
+#jenv doctor
 
 
 

diff --git a/ci/install-openjdk.bash b/ci/install-openjdk.bash
@@ -2,17 +2,16 @@
 set -euo pipefail
 DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-. ${DIR}/install-jenv.bash
-# try this...
 . ${DIR}/ensure-jenv-is-present.bash
 
 jdk=$1
 if [[ -z $jdk ]]; then
     jdk=openjdk8
 fi
 
-uname=$2
-if [[ -z $uname ]]; then
+if [[ $# -eq 2 ]]; then
+    uname=$2
+else 
     uname=$(uname)
 fi
 

diff --git a/ci/set-jdk.bash b/ci/set-jdk.bash
@@ -35,6 +35,9 @@ function set_jdk() {
         openjdk20)
             version=$(jenv versions | grep ^\ *20\.[0-9] | tail -1 | sed s/*//)
             ;;
+        openjdk21)
+            version=$(jenv versions | grep ^\ *21\.[0-9] | tail -1 | sed s/*//)
+            ;;
         *)
             echo Failed to find an available JDK matching ${abcl_jdk}
             echo   in $(jenv versions)
@@ -63,4 +66,3 @@ function set_jdk() {
     popd
 }
 
-set_jdk ${ABCL_JDK} ${ABCL_ROOT}