Merge branch 'asdf-java-version' into 'master'v3.11.2

Load the configured version of Java/Python

See merge request gitlab-org/security-products/license-management!163

1 files changed, 27 insertions, 3 deletions

diff --git a/run.sh b/run.sh
index 776ae98..8199f9e 100755
--- a/run.sh
+++ b/run.sh
@@ -4,6 +4,8 @@ set -e
 [[ -z ${SETUP_CMD:-} ]] && set -uo pipefail
 
 BUNDLE_JOBS="$(nproc)"
+export ASDF_JAVA_VERSION="${ASDF_JAVA_VERSION:-}"
+export ASDF_PYTHON_VERSION="${ASDF_PYTHON_VERSION:-}"
 export BUNDLE_JOBS
 export BUNDLE_WITHOUT="development:test"
 export CI_API_V4_URL="${CI_API_V4_URL:-https://gitlab.com/api/v4}"
@@ -15,6 +17,8 @@ export HISTFILESIZE=0
 export HISTSIZE=0
 export LANG=C.UTF-8
 export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:=--no-debug}
+export LM_JAVA_VERSION=${LM_JAVA_VERSION:-}
+export LM_PYTHON_VERSION=${LM_PYTHON_VERSION:-}
 export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-management-report.json'}
 export MAVEN_CLI_OPTS="${MAVEN_CLI_OPTS:--DskipTests}"
 export NO_UPDATE_NOTIFIER=true
@@ -61,6 +65,26 @@ function prepare_dotnet() {
   [[ $(ls ./*.sln 2> /dev/null) ]] && RECURSIVE="--recursive"
 }
 
+function prepare_java() {
+  if [ -n "$LM_JAVA_VERSION" ]; then
+    switch_to java "adopt-openjdk-${LM_JAVA_VERSION}"
+  elif [ -n "$ASDF_JAVA_VERSION" ]; then
+    switch_to_exact java "$ASDF_JAVA_VERSION"
+  else
+    switch_to java "adopt-openjdk-8"
+  fi
+}
+
+function prepare_python() {
+  if [ -n "$LM_PYTHON_VERSION" ]; then
+    switch_to python "$(major_version_from "$LM_PYTHON_VERSION")"
+  elif [ -n "$ASDF_PYTHON_VERSION" ]; then
+    switch_to_exact python "$ASDF_PYTHON_VERSION"
+  else
+    switch_to python "3"
+  fi
+}
+
 function prepare_tools() {
   if ! asdf current 2> >(grep -q 'is not installed'); then
     echo "Installing missing tools…"
@@ -69,6 +93,9 @@ function prepare_tools() {
 }
 
 function prepare_project() {
+  prepare_java
+  prepare_python
+
   if [[ -z ${SETUP_CMD:-} ]]; then
     prepare_tools || true
     prepare_dotnet || true
@@ -80,9 +107,6 @@ function prepare_project() {
   fi
 }
 
-switch_to python "$(major_version_from "${LM_PYTHON_VERSION:-3}")"
-switch_to java "adopt-openjdk-${LM_JAVA_VERSION:-8}"
-
 prepare_project
 [[ $CI_DEBUG_TRACE == 'true' ]] && debug_env