aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Bo Yang <teboring@google.com>2016-09-21 17:56:53 +0000
committerGravatar Bo Yang <teboring@google.com>2016-10-10 11:43:48 -0700
commit89d8e434284f2f7066677e91ef6872a23c96fc6a (patch)
tree07f60262c568555f294e4d85385c2a6120ef474b
parent7fecfdbaa83295d819088c67f834a69f824be6e9 (diff)
Fix travis, jenkins environment issues.
-rw-r--r--conformance/Makefile.am2
-rw-r--r--jenkins/docker/Dockerfile2
-rwxr-xr-xruby/travis-test.sh2
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 7e65bb41..53170723 100644
--- a/jenkins/docker/Dockerfile
+++ b/jenkins/docker/Dockerfile
@@ -117,7 +117,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"