Skip to content

Commit 26d781f

Browse files
nbagnardbucaojit
andauthored
SQL-2433: Update logic to extract versions (#295)
* Update logic to extract versions * Use correct input Co-authored-by: Oliver Bucaojit <[email protected]> --------- Co-authored-by: Oliver Bucaojit <[email protected]>
1 parent 5239891 commit 26d781f

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

.evg.yml

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -729,29 +729,33 @@ functions:
729729
# Other runs are snapshot builds (periodic builds or patches)
730730
if [[ "${triggered_by_git_tag}" != "" ]]; then
731731
# tag should be formatted as 'v<JDBC major>.<minor>.<patch>-libv<libmongosqltranslate major>.<minor>.<patch>
732-
export MDBJDBC_VER=$(echo ${triggered_by_git_tag} | cut -d '-' -f 1 | sed s/v// )
733-
export LIBMONGOSQLTRANSLATE_VER=$(echo ${triggered_by_git_tag} | cut -d '-' -f 2 | sed s/libv//)
732+
export MDBJDBC_VER=$(echo ${triggered_by_git_tag} | awk -F'-libv' '{print $1}' | sed s/v// )
733+
export LIBMONGOSQLTRANSLATE_VER=$(echo ${triggered_by_git_tag} | awk -F'-libv' '{print $2}')
734734
else
735735
export MDBJDBC_VER=snapshot
736736
export LIBMONGOSQLTRANSLATE_VER=snapshot
737737
fi
738738
739-
case ${_platform} in
740-
ubuntu2204-64-jdk-8)
741-
JAVA_HOME=/opt/java/jdk8
742-
;;
743-
ubuntu2204-64-jdk-11)
744-
JAVA_HOME=/opt/java/jdk11
745-
;;
746-
amazon2-arm64-jdk-11)
747-
JAVA_HOME=/usr/lib/jvm/java-11
748-
;;
749-
*)
750-
echo "ERROR: invalid value for \${_platform}: '$_platform'"
751-
echo "Allowed values: 'amazon2-arm64-jdk-11', 'ubuntu2204-64-jdk-8', 'ubuntu2204-64-jdk-11'"
752-
exit 1
753-
;;
754-
esac
739+
echo "JDBC version = $MDBJDBC_VER"
740+
echo "Mongosqltranslate version = $LIBMONGOSQLTRANSLATE_VER"
741+
742+
if [[ "${_platform}" == "ubuntu2204-64-jdk-8" ]]; then
743+
export JAVA_HOME=/opt/java/jdk8
744+
elif [[ "${_platform}" == "ubuntu2204-64-jdk-11" ]]; then
745+
export JAVA_HOME=/opt/java/jdk11
746+
elif [[ "${_platform}" == "amazon2-arm64-jdk-11" ]]; then
747+
export JAVA_HOME=/usr/lib/jvm/java-11
748+
else
749+
# According to DEVPROD, the Java toolchain should always be under `/opt/java/`
750+
if [ -d "/opt/java/jdk11" ]; then
751+
export JAVA_HOME=/opt/java/jdk11
752+
else
753+
echo >&2 "Can't find Java. `/opt/java/jdk11` does not exist"
754+
exit 1
755+
fi
756+
fi
757+
758+
echo "Java home = $JAVA_HOME"
755759
756760
# export any environment variables that will be needed by subprocesses
757761
export PROJECT_DIRECTORY="$(pwd)"
-115 KB
Binary file not shown.

0 commit comments

Comments
 (0)