From 9c11fe2f1db1ccf5bcdb0724c18cc462ff5fbbd7 Mon Sep 17 00:00:00 2001 From: caisq Date: Fri, 23 Sep 2016 02:05:15 -0400 Subject: [PATCH] Fix recently-introduced bug in ci_build.sh re. cmake builds (#4541) Commit 4316aeb inadvertently made cmake builds depend on bazel. This change set removes the dependency. --- tensorflow/tools/ci_build/ci_build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tensorflow/tools/ci_build/ci_build.sh b/tensorflow/tools/ci_build/ci_build.sh index 2a8aeddc449..6f65bbc056e 100755 --- a/tensorflow/tools/ci_build/ci_build.sh +++ b/tensorflow/tools/ci_build/ci_build.sh @@ -67,7 +67,6 @@ if [ "$#" -lt 1 ] || [ ! -e "${SCRIPT_DIR}/Dockerfile.${CONTAINER_TYPE}" ]; then exit 1 fi - # Optional arguments - environment variables. For example: # CI_DOCKER_EXTRA_PARAMS='-it --rm' CI_COMMAND_PREFIX='' tensorflow/tools/ci_build/ci_build.sh CPU /bin/bash CI_TENSORFLOW_SUBMODULE_PATH="${CI_TENSORFLOW_SUBMODULE_PATH:-.}" @@ -79,6 +78,11 @@ if [[ ! -z "${TF_BUILD_DISABLE_GCP}" ]] && CI_COMMAND_PREFIX+=("--disable-gcp") fi +# cmake (CPU) builds do not require configuration. +if [[ "${CONTAINER_TYPE}" == "cmake" ]]; then + CI_COMMAND_PREFIX="" +fi + # Helper function to traverse directories up until given file is found. function upsearch () { test / == "$PWD" && return || \