diff options
| author | Bo Yang <teboring@google.com> | 2016-09-21 17:56:53 +0000 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2016-09-21 22:56:47 +0000 |
| commit | b8e7e892c805c0e3b41238549af2d94a4c2403d3 (patch) | |
| tree | 6f102fb46f23b9fd5cd5e465504c7fb16df54c43 | |
| parent | 050c014ac655a1a47e0101470ab271514ea0c16d (diff) | |
| download | protobuf-b8e7e892c805c0e3b41238549af2d94a4c2403d3.tar.gz protobuf-b8e7e892c805c0e3b41238549af2d94a4c2403d3.tar.bz2 protobuf-b8e7e892c805c0e3b41238549af2d94a4c2403d3.zip | |
Fix travis, jenkins environment issues.
| -rw-r--r-- | conformance/Makefile.am | 2 | ||||
| -rw-r--r-- | jenkins/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | ruby/travis-test.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am index bdd23a07..5985e1d9 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -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 diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index 53ac38f3..989e505b 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -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 && \ diff --git a/ruby/travis-test.sh b/ruby/travis-test.sh index 59e970a6..d3022657 100755 --- a/ruby/travis-test.sh +++ b/ruby/travis-test.sh @@ -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" |