diff options
| author |  Yifei Feng <1192265+yifeif@users.noreply.github.com> | 2018-04-17 10:53:07 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-17 10:53:07 -0700 |
| commit | 3177c063efcf4721a45d065cde72a1f605d3961a (patch) | |
| tree | 03fbda9a4c17822c09e83ac9395cc27d9ef4d5cc | |
| parent | 3128b43eb0bf37ac3c49cb22a6e1789d8ea346e8 (diff) | |
Enable consumption of GIT_TAG_OVERRIDE env var in release build script. (#18579)
Enable consumption of GIT_TAG_OVERRIDE env var in release build script.
| -rw-r--r-- | tensorflow/contrib/cmake/tf_core_framework.cmake | 2 | ||||
| -rwxr-xr-x | tensorflow/tools/ci_build/builds/pip.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tensorflow/contrib/cmake/tf_core_framework.cmake b/tensorflow/contrib/cmake/tf_core_framework.cmake index f7cb186c7c..b47c32f1c4 100644 --- a/tensorflow/contrib/cmake/tf_core_framework.cmake +++ b/tensorflow/contrib/cmake/tf_core_framework.cmake @@ -276,7 +276,7 @@ add_custom_command(OUTPUT __force_rebuild COMMAND ${CMAKE_COMMAND} -E echo) add_custom_command(OUTPUT ${VERSION_INFO_CC} COMMAND ${PYTHON_EXECUTABLE} ${tensorflow_source_dir}/tensorflow/tools/git/gen_git_source.py - ARGS --raw_generate ${VERSION_INFO_CC} --source_dir ${tensorflow_source_dir} + ARGS --raw_generate ${VERSION_INFO_CC} --source_dir ${tensorflow_source_dir} --git_tag_override=${GIT_TAG_OVERRIDE} DEPENDS __force_rebuild) set(tf_version_srcs ${tensorflow_source_dir}/tensorflow/core/util/version_info.cc) diff --git a/tensorflow/tools/ci_build/builds/pip.sh b/tensorflow/tools/ci_build/builds/pip.sh index 82042b93c0..5fa75e1d61 100755 --- a/tensorflow/tools/ci_build/builds/pip.sh +++ b/tensorflow/tools/ci_build/builds/pip.sh @@ -123,6 +123,10 @@ done BAZEL_FLAGS=$(str_strip "${BAZEL_FLAGS}") +if [[ -z "$GIT_TAG_OVERRIDE" ]]; then + BAZEL_FLAGS+=" --action_env=GIT_TAG_OVERRIDE" +fi + echo "Using Bazel flags: ${BAZEL_FLAGS}" PIP_BUILD_TARGET="//tensorflow/tools/pip_package:build_pip_package" |