fix grpc cares dependency.

alibaba · Oct 9, 2022 · f6f9070 · f6f9070
1 parent 6569610
commit f6f9070
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/scripts/upload_gl_packages.sh b/.github/workflows/scripts/upload_gl_packages.sh
@@ -14,7 +14,7 @@ else
   pyabis=$(echo $PYABI | tr ":" "\n")
   for abi in $pyabis; do
     docker run --rm -e "PYABI=$abi" -e "GIT_TAG=$GIT_TAG" -v `pwd`:/io \
-      $DOCKER_IMAGE $PRE_CMD bash -c "chmod +x /io/.github/workflows/scripts/build_gl.sh; git config --global --add safe.directory /io; /io/.github/workflows/scripts/build_gl.sh"
+      $DOCKER_IMAGE $PRE_CMD bash -c "chmod +x /io/.github/workflows/scripts/build_gl.sh; git config --global --add safe.directory '*'; /io/.github/workflows/scripts/build_gl.sh"
     sudo chown -R $(id -u):$(id -g) ./graphlearn/*
     mv graphlearn/dist/*.whl /tmp
   done

diff --git a/graphlearn/install_dependencies.sh b/graphlearn/install_dependencies.sh
@@ -38,14 +38,14 @@ debian_packages=(
   libopenblas-dev
   libgflags-dev
   libssl-dev
-  libc-ares-dev
   zlib1g-dev
 )
 
 if [ "${build_hiactor}" = true ] ; then
   debian_packages=(
     "${debian_packages[@]}"
     # hiactor dependencies
+    libc-ares-dev
     ragel
     libhwloc-dev
     libnuma-dev

diff --git a/third_party/grpc/build.sh b/third_party/grpc/build.sh
@@ -5,16 +5,16 @@ code_src=${script_dir}/grpc
 install_prefix=${script_dir}/build
 cores=$(cat < /proc/cpuinfo | grep -c "processor")
 
-cd "${code_src}" && git submodule update --init third_party/protobuf third_party/abseil-cpp third_party/re2 && \
+cd "${code_src}" && git submodule update --init third_party/protobuf third_party/abseil-cpp third_party/re2 third_party/cares && \
 mkdir -p cmake/build && cd cmake/build && \
 cmake -DCMAKE_CXX_FLAGS="-fPIC" \
   -DCMAKE_BUILD_TYPE=Release \
   -DgRPC_INSTALL=ON \
   -DCMAKE_INSTALL_PREFIX="${install_prefix}" \
   -DgRPC_BUILD_TESTS=OFF \
-  -DgRPC_CARES_PROVIDER=package \
   -DgRPC_SSL_PROVIDER=package \
   -DgRPC_ZLIB_PROVIDER=package \
   ../.. && \
 make -j"${cores}" && make install &&
 cp -r "${code_src}"/third_party/abseil-cpp/absl "${install_prefix}"/include
+cp -r "${code_src}"/third_party/cares/cares "${install_prefix}"/include