diff options
| author |  Maciek Chociej <maciekc@google.com> | 2016-06-22 19:23:18 +0200 |
|---|---|---|
| committer | Maciek Chociej <maciekc@google.com> | 2016-06-22 19:23:18 +0200 |
| commit | fbb5adf298f152ccf3df03469ae1a4ff3e069ddc (patch) | |
| tree | 40cdddebe278b3a4fd368d34e75174bf1f815dbd /tensorflow/tools | |
| parent | 603c91330eac930cf6cfac4923ca45648f1b1729 (diff) | |
| parent | bac4e0d4f4fac55361e7735a13a15bd65693346d (diff) | |
Merge commit for internal changes
Diffstat (limited to 'tensorflow/tools')
| -rwxr-xr-x | tensorflow/tools/ci_build/builds/integration_tests.sh | 3 | ||||
| -rwxr-xr-x | tensorflow/tools/ci_build/install/install_bazel.sh | 2 | ||||
| -rw-r--r-- | tensorflow/tools/docker/Dockerfile.devel | 2 | ||||
| -rw-r--r-- | tensorflow/tools/docker/Dockerfile.devel-gpu | 2 | ||||
| -rw-r--r-- | tensorflow/tools/pip_package/setup.py | 1 |
5 files changed, 6 insertions, 4 deletions
diff --git a/tensorflow/tools/ci_build/builds/integration_tests.sh b/tensorflow/tools/ci_build/builds/integration_tests.sh index 9c0f54ffe9..18dbd2a236 100755 --- a/tensorflow/tools/ci_build/builds/integration_tests.sh +++ b/tensorflow/tools/ci_build/builds/integration_tests.sh @@ -112,7 +112,8 @@ test_ffmpeg_lib() { return $? else bazel test tensorflow/contrib/ffmpeg/default:ffmpeg_lib_installed_test \ - tensorflow/contrib/ffmpeg:decode_audio_op_test + tensorflow/contrib/ffmpeg:decode_audio_op_test \ + tensorflow/contrib/ffmpeg:encode_audio_op_test return $? fi } diff --git a/tensorflow/tools/ci_build/install/install_bazel.sh b/tensorflow/tools/ci_build/install/install_bazel.sh index 17de972ecf..f033c2514a 100755 --- a/tensorflow/tools/ci_build/install/install_bazel.sh +++ b/tensorflow/tools/ci_build/install/install_bazel.sh @@ -17,7 +17,7 @@ set -e # Select bazel version. -BAZEL_VERSION="0.2.1" +BAZEL_VERSION="0.3.0" # Install bazel. mkdir /bazel diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel index bdd5c9f140..49d7207e09 100644 --- a/tensorflow/tools/docker/Dockerfile.devel +++ b/tensorflow/tools/docker/Dockerfile.devel @@ -64,7 +64,7 @@ RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \ >>/root/.bazelrc ENV BAZELRC /root/.bazelrc # Install the most recent bazel release. -ENV BAZEL_VERSION 0.2.1 +ENV BAZEL_VERSION 0.3.0 WORKDIR / RUN mkdir /bazel && \ cd /bazel && \ diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu index 2827ea9a64..2a6737fd24 100644 --- a/tensorflow/tools/docker/Dockerfile.devel-gpu +++ b/tensorflow/tools/docker/Dockerfile.devel-gpu @@ -64,7 +64,7 @@ RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \ >>/root/.bazelrc ENV BAZELRC /root/.bazelrc # Install the most recent bazel release. -ENV BAZEL_VERSION 0.2.1 +ENV BAZEL_VERSION 0.3.0 WORKDIR / RUN mkdir /bazel && \ cd /bazel && \ diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py index 75676601a2..07b10de08c 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -183,6 +183,7 @@ setup( 'tensorboard/dist/index.html', 'tensorboard/dist/tf-tensorboard.html', 'tensorboard/lib/css/global.css', + 'tensorboard/TAG', ] + matches, }, zip_safe=False, |