Fix CI

facebookincubator · Jun 25, 2024 · 52a74bd · 52a74bd
1 parent 47cad4c
commit 52a74bd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/CMake/resolve_dependency_modules/boringssl.cmake b/CMake/resolve_dependency_modules/boringssl.cmake
@@ -13,11 +13,11 @@
 # limitations under the License.
 include_guard(GLOBAL)
 
-set(VELOX_BORINGSSL_BUILD_VERSION fips-20220613)
+set(VELOX_BORINGSSL_BUILD_VERSION 45db24b36a030ec54464ea7a26c362f3c82305ee)
 set(VELOX_BORINGSSL_BUILD_SHA256_CHECKSUM
-    a343962da2fbb10d8fa2cd9a2832839a23045a197c0ff306dc0fa0abb85759b3)
+    ec2a8d4790cb7f21094b15d034347c5642cb04ed6357f34fb0e94edf92a22995)
 string(CONCAT VELOX_BORINGSSL_SOURCE_URL
-              "https://github.com/google/boringssl/archive/refs/tags/"
+              "https://github.com/google/boringssl/archive/"
               "${VELOX_BORINGSSL_BUILD_VERSION}.tar.gz")
 
 resolve_dependency_url(BORINGSSL)

diff --git a/CMake/resolve_dependency_modules/cares.cmake b/CMake/resolve_dependency_modules/cares.cmake
@@ -25,13 +25,13 @@ resolve_dependency_url(CARES)
 message(STATUS "Building C-ARES from source")
 
 FetchContent_Declare(
-  cares
+  c-ares
   URL ${VELOX_CARES_SOURCE_URL}
   URL_HASH ${VELOX_CARES_BUILD_SHA256_CHECKSUM}
   OVERRIDE_FIND_PACKAGE EXCLUDE_FROM_ALL SYSTEM)
 
 set(CARES_STATIC ON)
 set(CARES_INSTALL ON)
 set(CARES_SHARED OFF)
-FetchContent_MakeAvailable(cares)
+FetchContent_MakeAvailable(c-ares)
 add_library(cares::cares ALIAS c-ares)
diff --git a/scripts/setup-centos9.sh b/scripts/setup-centos9.sh
@@ -60,7 +60,7 @@ function install_velox_deps_from_dnf {
   dnf_install libevent-devel \
     openssl-devel re2-devel libzstd-devel lz4-devel double-conversion-devel \
     libdwarf-devel elfutils-libelf-devel curl-devel libicu-devel bison flex \
-    libsodium-devel zlib-devel
+    libsodium-devel zlib-devel go
 
   # install sphinx for doc gen
   pip install sphinx sphinx-tabs breathe sphinx_rtd_theme

diff --git a/velox/functions/sparksql/fuzzer/CMakeLists.txt b/velox/functions/sparksql/fuzzer/CMakeLists.txt
@@ -45,16 +45,15 @@ add_custom_command(
   COMMENT "Running PROTO compiler"
   VERBATIM)
 add_custom_target(spark_connect_proto ALL DEPENDS ${PROTO_OUTPUT_FILES})
-# add_dependencies(spark_connect_proto protobuf::libprotobuf)
 
-find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
 # Generate grpc headers and sources
 add_custom_command(
   OUTPUT ${GRPC_OUTPUT_FILES}
   COMMAND
     ${Protobuf_PROTOC_EXECUTABLE} --proto_path ${CMAKE_SOURCE_DIR}/ --proto_path
     ${Protobuf_INCLUDE_DIRS} --grpc_out=${CMAKE_BINARY_DIR}
-    --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} ${PROTO_FILES_FULL}
+    --plugin=protoc-gen-grpc=$<TARGET_FILE:gRPC::grpc_cpp_plugin>
+    ${PROTO_FILES_FULL}
   DEPENDS ${Protobuf_PROTOC_EXECUTABLE}
   COMMENT "Running gRPC C++ protocol buffer compiler"
   VERBATIM)

diff --git a/velox/functions/sparksql/fuzzer/tests/SparkQueryRunnerTest.cpp b/velox/functions/sparksql/fuzzer/tests/SparkQueryRunnerTest.cpp
@@ -47,7 +47,7 @@ class SparkQueryRunnerTest : public ::testing::Test,
 
 // This test requires a Spark Coordinator running at localhost, so disable it
 // by default.
-TEST_F(SparkQueryRunnerTest, basic) {
+TEST_F(SparkQueryRunnerTest, DISABLED_basic) {
   auto queryRunner =
       std::make_unique<fuzzer::SparkQueryRunner>("localhost:15002");