From b8e7e892c805c0e3b41238549af2d94a4c2403d3 Mon Sep 17 00:00:00 2001
From: Bo Yang <teboring@google.com>
Date: Wed, 21 Sep 2016 17:56:53 +0000
Subject: Fix travis, jenkins environment issues.

---
 conformance/Makefile.am   | 2 +-
 jenkins/docker/Dockerfile | 2 +-
 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"
-- 
cgit v1.2.3