Skip to content

Commit a188380

Browse files
committed
Revert "Evergreen: Fix setting JAVA_HOME setting"
This reverts commit 5f2aa6c.
1 parent daf764b commit a188380

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

.evergreen/javaConfig.bash

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
export JDK8="/opt/java/jdk8"
55
export JDK11="/opt/java/jdk11"
66
export JDK17="/opt/java/jdk17"
7-
8-
if [ -d "$JDK11" ]; then
9-
export JAVA_HOME=$JDK11
10-
fi
7+
export JAVA_HOME=$JDK11
118

129
export JAVA_VERSION=${JDK:-11}
1310

.evergreen/run-mongodb-aws-ecs-test.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ set -o errexit # Exit the script with error if any of the commands fail
1212
############################################
1313
# Main Program #
1414
############################################
15+
RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
16+
. "${RELATIVE_DIR_PATH}/javaConfig.bash"
1517

1618
if [[ -z "$1" ]]; then
1719
echo "usage: $0 <MONGODB_URI>"
@@ -34,10 +36,6 @@ if ! which git ; then
3436
fi
3537

3638
cd src
37-
38-
RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
39-
. "${RELATIVE_DIR_PATH}/javaConfig.bash"
40-
4139
./gradlew -version
4240

4341
echo "Running tests..."

0 commit comments

Comments
 (0)