From ab90aafcb657df2f06b5b5ba04c0ca835fa812c4 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 31 Oct 2024 16:47:03 -0700 Subject: [PATCH] [Test] Remove unnecessary cmake 3.16 installation (#38048) gRPC requires at least CMake 3.16 or later so the test script no longer needs to install CMake 3.16. Closes #38048 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/38048 from veblush:cmake-no 3e364d97703dba65463e61ca66dcbea2d20ff1c6 PiperOrigin-RevId: 691976945 --- test/distrib/cpp/run_distrib_test_cmake_fetchcontent.sh | 6 ------ test/distrib/cpp/run_distrib_test_cmake_module_install.sh | 6 ------ 2 files changed, 12 deletions(-) diff --git a/test/distrib/cpp/run_distrib_test_cmake_fetchcontent.sh b/test/distrib/cpp/run_distrib_test_cmake_fetchcontent.sh index 9cf2f8f8c20..31b24415594 100755 --- a/test/distrib/cpp/run_distrib_test_cmake_fetchcontent.sh +++ b/test/distrib/cpp/run_distrib_test_cmake_fetchcontent.sh @@ -21,12 +21,6 @@ grpc_dir=$(pwd) # Install openssl (to use instead of boringssl) apt-get update && apt-get install -y libssl-dev -# Install CMake 3.16 -apt-get update && apt-get install -y wget -wget -q -O cmake-linux.sh https://github.com/Kitware/CMake/releases/download/v3.16.1/cmake-3.16.1-Linux-x86_64.sh -sh cmake-linux.sh -- --skip-license --prefix=/usr -rm cmake-linux.sh - # Use externally provided env to determine build parallelism, otherwise use default. GRPC_CPP_DISTRIBTEST_BUILD_COMPILER_JOBS=${GRPC_CPP_DISTRIBTEST_BUILD_COMPILER_JOBS:-4} diff --git a/test/distrib/cpp/run_distrib_test_cmake_module_install.sh b/test/distrib/cpp/run_distrib_test_cmake_module_install.sh index 141a8a50fea..1dfa1697998 100755 --- a/test/distrib/cpp/run_distrib_test_cmake_module_install.sh +++ b/test/distrib/cpp/run_distrib_test_cmake_module_install.sh @@ -20,12 +20,6 @@ cd "$(dirname "$0")/../../.." # Install openssl (to use instead of boringssl) apt-get update && apt-get install -y libssl-dev -# Install CMake 3.16 -apt-get update && apt-get install -y wget -wget -q -O cmake-linux.sh https://github.com/Kitware/CMake/releases/download/v3.16.1/cmake-3.16.1-Linux-x86_64.sh -sh cmake-linux.sh -- --skip-license --prefix=/usr -rm cmake-linux.sh - # Use externally provided env to determine build parallelism, otherwise use default. GRPC_CPP_DISTRIBTEST_BUILD_COMPILER_JOBS=${GRPC_CPP_DISTRIBTEST_BUILD_COMPILER_JOBS:-4}