Sfoglia il codice sorgente

fix python cpp kokoro build

Yilun Chong 7 anni fa
parent
commit
14bc658175
2 ha cambiato i file con 4 aggiunte e 1 eliminazioni
  1. 2 0
      kokoro/linux/build_and_run_docker.sh
  2. 2 1
      python/tox.ini

+ 2 - 0
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' \

+ 2 - 1
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