diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/doxygen/Doxyfile.c++ | 2 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.c++.internal | 2 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.core | 2 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 2 | ||||
| -rw-r--r-- | tools/jenkins/grpc_jenkins_slave/Dockerfile | 1 | ||||
| -rwxr-xr-x | tools/jenkins/run_jenkins.sh | 4 | ||||
| -rwxr-xr-x | tools/run_tests/build_python.sh | 2 | ||||
| -rwxr-xr-x | tools/run_tests/prepare_travis.sh | 6 |
8 files changed, 12 insertions, 9 deletions
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index cc2d7f46ae..5616f2c466 100644 --- a/tools/doxygen/Doxyfile.c++ +++ b/tools/doxygen/Doxyfile.c++ @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.9.1.0 +PROJECT_NUMBER = 0.10.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 71e2d012bb..6d323274c9 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.9.1.0 +PROJECT_NUMBER = 0.10.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index a834728150..7cc96b2e06 100644 --- a/tools/doxygen/Doxyfile.core +++ b/tools/doxygen/Doxyfile.core @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.9.1.0 +PROJECT_NUMBER = 0.10.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 8a79a67646..9aecfb9b9a 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.9.1.0 +PROJECT_NUMBER = 0.10.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/jenkins/grpc_jenkins_slave/Dockerfile b/tools/jenkins/grpc_jenkins_slave/Dockerfile index c48bc0220f..b12c309e87 100644 --- a/tools/jenkins/grpc_jenkins_slave/Dockerfile +++ b/tools/jenkins/grpc_jenkins_slave/Dockerfile @@ -83,6 +83,7 @@ ENV NUGET mono /var/local/NuGet.exe # Node dependencies # Install nvm +RUN touch .profile RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash RUN /bin/bash -l -c "nvm install 0.12" diff --git a/tools/jenkins/run_jenkins.sh b/tools/jenkins/run_jenkins.sh index 5e8ddb92fc..763a930dd8 100755 --- a/tools/jenkins/run_jenkins.sh +++ b/tools/jenkins/run_jenkins.sh @@ -56,9 +56,11 @@ then $FETCH_PULL_REQUEST_CMD \ && git checkout -f $GIT_COMMIT \ && git submodule update \ + && pip install simplejson mako \ && nvm use 0.12 \ && rvm use ruby-2.1 \ - && tools/run_tests/run_tests.py -t -l $language" || DOCKER_FAILED="true" + && CONFIG=$config tools/run_tests/prepare_travis.sh \ + && CPPFLAGS=-I/tmp/prebuilt/include tools/run_tests/run_tests.py -t -c $config -l $language" || DOCKER_FAILED="true" DOCKER_CID=`cat docker.cid` if [ "$DOCKER_FAILED" == "" ] diff --git a/tools/run_tests/build_python.sh b/tools/run_tests/build_python.sh index 53db6af0ea..d9b7644f44 100755 --- a/tools/run_tests/build_python.sh +++ b/tools/run_tests/build_python.sh @@ -38,5 +38,5 @@ rm -rf python2.7_virtual_environment virtualenv -p /usr/bin/python2.7 python2.7_virtual_environment source python2.7_virtual_environment/bin/activate pip install -r src/python/requirements.txt -CFLAGS="-I$root/include -std=c89" LDFLAGS=-L$root/libs/$CONFIG pip install src/python/src +CFLAGS="-I$root/include -std=c89 -Werror" LDFLAGS=-L$root/libs/$CONFIG pip install src/python/src pip install src/python/interop diff --git a/tools/run_tests/prepare_travis.sh b/tools/run_tests/prepare_travis.sh index 34a058f2a8..10546535e8 100755 --- a/tools/run_tests/prepare_travis.sh +++ b/tools/run_tests/prepare_travis.sh @@ -32,17 +32,17 @@ cd `dirname $0`/../.. grpc_dir=`pwd` distrib=`md5sum /etc/issue | cut -f1 -d\ ` -echo "Configuring for disbribution $distrib" +echo "Configuring for distribution $distrib" git submodule | while read sha path extra ; do cd /tmp name=`basename $path` file=$name-$sha-$CONFIG-prebuilt-$distrib.tar.gz - echo -n "$file ..." + echo -n "Looking for $file ..." url=http://storage.googleapis.com/grpc-prebuilt-packages/$file wget -q $url && ( echo " Found." tar xfz $file - ) || true + ) || echo " Not found." done mkdir -p bins/$CONFIG/protobuf |