organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fix travis, jenkins environment issues.

Browse source
This commit is contained in:
Bo Yang 2016-09-21 17:56:53 +00:00
parent 050c014ac6
commit b8e7e892c8
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conformance/Makefile.am
View file

@ -276,6 +276,6 @@ test_python_cpp: protoc_middleman conformance-test-runner
if OBJC_CONFORMANCE_TEST
test_objc: protoc_middleman conformance-test-runner conformance-objc
./conformance-test-runner --enforce_recomemnded --failure_list failure_list_objc.txt ./conformance-objc
./conformance-test-runner --enforce_recommended --failure_list failure_list_objc.txt ./conformance-objc
endif

2
jenkins/docker/Dockerfile
View file

@ -115,7 +115,7 @@ RUN cd /tmp && \
cd protobuf && \
./autogen.sh && \
./configure && \
make -j6 && \
make -j7 && \
cd java && \
$MVN install dependency:go-offline -Dmaven.repo.local=$MAVEN_REPO && \
cd ../javanano && \

2
ruby/travis-test.sh
View file

@ -8,7 +8,7 @@ test_version() {
if [ "$version" == "jruby-1.7" ] ; then
# No conformance tests yet -- JRuby is too broken to run them.
bash --login -c \
"rvm install $version && rvm use $version && \
"rvm install $version && rvm use $version && rvm get head && \
which ruby && \
gem install bundler && bundle && \
rake test"