Fix travis, jenkins environment issues.

pull/2234/head
Bo Yang 9 years ago
parent 7fecfdbaa8
commit 89d8e43428
  1. 2
      conformance/Makefile.am
  2. 2
      jenkins/docker/Dockerfile
  3. 2
      ruby/travis-test.sh

@ -276,6 +276,6 @@ test_python_cpp: protoc_middleman conformance-test-runner
if OBJC_CONFORMANCE_TEST if OBJC_CONFORMANCE_TEST
test_objc: protoc_middleman conformance-test-runner conformance-objc 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 endif

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

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

Loading…
Cancel
Save