diff options
| author | Yilun Chong <yilunchong@google.com> | 2018-07-12 16:49:26 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-15 21:01:48 -0700 |
| commit | 359889bafd0e86db8d75ae7683b45fc673a9e78e (patch) | |
| tree | ff1ac93cde0865f95a86c1a5cf9943ff1b217f71 | |
| parent | c1e6c4df738d62fbb9eff3f735292d349655ab03 (diff) | |
| download | protobuf-359889bafd0e86db8d75ae7683b45fc673a9e78e.tar.gz protobuf-359889bafd0e86db8d75ae7683b45fc673a9e78e.tar.bz2 protobuf-359889bafd0e86db8d75ae7683b45fc673a9e78e.zip | |
fix python cpp kokoro build
| -rwxr-xr-x | kokoro/linux/build_and_run_docker.sh | 2 | ||||
| -rw-r--r-- | python/tox.ini | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/kokoro/linux/build_and_run_docker.sh b/kokoro/linux/build_and_run_docker.sh index 6a1f327a..f9c60710 100755 --- a/kokoro/linux/build_and_run_docker.sh +++ b/kokoro/linux/build_and_run_docker.sh @@ -35,6 +35,8 @@ echo $git_root docker run \ "$@" \ -e CCACHE_DIR=$CCACHE_DIR \ + -e KOKORO_BUILD_NUMBER=$KOKORO_BUILD_NUMBER \ + -e KOKORO_BUILD_ID=$KOKORO_BUILD_ID \ -e EXTERNAL_GIT_ROOT="/var/local/kokoro/protobuf" \ -e TEST_SET="$TEST_SET" \ -e THIS_IS_REALLY_NEEDED='see https://github.com/docker/docker/issues/14203 for why docker is awful' \ diff --git a/python/tox.ini b/python/tox.ini index 38a81b4f..4eb319d2 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -4,7 +4,8 @@ envlist = [testenv] usedevelop=true -passenv = CC +passenv = + CC KOKORO_BUILD_ID KOKORO_BUILD_NUMBER setenv = cpp: LD_LIBRARY_PATH={toxinidir}/../src/.libs cpp: DYLD_LIBRARY_PATH={toxinidir}/../src/.libs |