fix ci (apache#45)

* set boost source in ci * ci fix, docker image * fix typo
jikunshang · May 15, 2020 · d704a6a · d704a6a
1 parent 2738f4a
commit d704a6a
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 2 deletions.
diff --git a/ci/docker/linux-apt-c-glib.dockerfile b/ci/docker/linux-apt-c-glib.dockerfile
@@ -26,6 +26,7 @@ RUN apt-get update -y -q && \
         libgirepository1.0-dev \
         libglib2.0-doc \
         luarocks \
+        libnuma-dev \
         pkg-config \
         ruby-dev && \
     if [ "$(lsb_release --codename --short)" = "xenial" ]; then \

diff --git a/ci/docker/ubuntu-14.04-cpp.dockerfile b/ci/docker/ubuntu-14.04-cpp.dockerfile
@@ -31,6 +31,7 @@ RUN apt-get update -y -q && \
         gcc \
         gdb \
         git \
+        libnuma-dev \
         libbz2-dev \
         libgoogle-glog-dev \
         libsnappy-dev \

diff --git a/ci/docker/ubuntu-16.04-cpp.dockerfile b/ci/docker/ubuntu-16.04-cpp.dockerfile
@@ -41,6 +41,7 @@ RUN apt-get update -y -q && \
         gcc \
         gdb \
         git \
+        libnuma-dev \
         libboost-all-dev \
         libbrotli-dev \
         libbz2-dev \

diff --git a/ci/docker/ubuntu-18.04-cpp.dockerfile b/ci/docker/ubuntu-18.04-cpp.dockerfile
@@ -101,6 +101,7 @@ ENV ARROW_BUILD_TESTS=ON \
     ARROW_WITH_SNAPPY=ON \
     ARROW_WITH_ZLIB=ON \
     ARROW_WITH_ZSTD=ON \
+    BOOST_SOURCE=BUNDLED \
     GTest_SOURCE=BUNDLED \
     ORC_SOURCE=BUNDLED \
     PARQUET_BUILD_EXECUTABLES=ON \

diff --git a/ci/docker/ubuntu-18.04-r-sanitizer.dockerfile b/ci/docker/ubuntu-18.04-r-sanitizer.dockerfile
@@ -28,6 +28,7 @@ RUN apt-get update -y -q && \
       gcc \
       git \
       libbenchmark-dev \
+      libnuma-dev \
       libboost-filesystem-dev \
       libboost-regex-dev \
       libboost-system-dev \

diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile
@@ -51,6 +51,7 @@ RUN apt-get update -y -q && \
         gdb \
         git \
         libbenchmark-dev \
+        libnuma-dev \
         libboost-filesystem-dev \
         libboost-regex-dev \
         libboost-system-dev \

diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh
@@ -47,8 +47,8 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
   pushd /tmp/vmemcache
     mkdir build && cd build
     cmake .. -DCMAKE_INSTALL_PREFIX=/usr/
-    make --ignore 
-    make install 
+    make --ignore -j$(nproc)
+    make install --ignore -j$(nproc)
   popd
 fi