浏览代码

Fix travis, jenkins environment issues.

Bo Yang 9 年之前
父节点
当前提交
89d8e43428
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      conformance/Makefile.am
  2. 1 1
      jenkins/docker/Dockerfile
  3. 1 1
      ruby/travis-test.sh

+ 1 - 1
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

+ 1 - 1
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 && \

+ 1 - 1
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"