Update turbine

google/turbine@cb60060
bazelbuild · Sep 29, 2021 · cd86002 · cd86002
1 parent 94b810f
commit cd86002
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/test/shell/bazel/bazel_java_test.sh b/src/test/shell/bazel/bazel_java_test.sh
@@ -97,6 +97,13 @@ if [[ $# -gt 0 ]]; then
   JAVA_RUNTIME_VERSION="$1"; shift
   add_to_bazelrc "build --java_runtime_version=${JAVA_RUNTIME_VERSION}"
   add_to_bazelrc "build --tool_java_runtime_version=${JAVA_RUNTIME_VERSION}"
+  if [[ "${JAVA_RUNTIME_VERSION}" == 8 ]]; then
+    JAVA_TOOLCHAIN="@bazel_tools//tools/jdk:toolchain_java8"
+  elif [[ "${JAVA_RUNTIME_VERSION}" == 11 ]]; then
+    JAVA_TOOLCHAIN="@bazel_tools//tools/jdk:toolchain_java11"
+  else
+    JAVA_TOOLCHAIN="@bazel_tools//tools/jdk:toolchain_jdk_${JAVA_RUNTIME_VERSION}"
+  fi
 fi
 
 export TESTENV_DONT_BAZEL_CLEAN=1

diff --git a/third_party/turbine/turbine_direct.jar b/third_party/turbine/turbine_direct.jar