bump gRPC to v1.48.1 for CMake Linux CI (open-telemetry#1608)

yxue · Dec 5, 2022 · 6f0edbf · 6f0edbf
1 parent 9261811
commit 6f0edbf
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/ci/setup_grpc.sh b/ci/setup_grpc.sh
@@ -6,21 +6,28 @@
 set -e
 export DEBIAN_FRONTEND=noninteractive
 old_grpc_version='v1.33.2'
-new_grpc_version='v1.43.2'
+new_grpc_version='v1.48.1'
 gcc_version_for_new_grpc='5.1'
+std_version='14'
 install_grpc_version=${new_grpc_version}
 grpc_version='v1.39.0'
 install_dir='/usr/local/'
 usage() { echo "Usage: $0 [-v <gcc-version>] [-i <install_dir>"] 1>&2; exit 1;}
 
-while getopts ":v:i:" o; do
+while getopts ":v:i:r:s:" o; do
     case "${o}" in
         v)
             gcc_version=${OPTARG}
             ;;
         i)
             install_dir=${OPTARG}
             ;;
+        r)
+            install_grpc_version=${OPTARG}
+            ;;
+        s)
+            std_version=${OPTARG}
+            ;;
         *)
             usage
             ;;
@@ -31,6 +38,7 @@ if [ -z "${gcc_version}" ]; then
 fi
 if [[ "${gcc_version}" < "${gcc_version_for_new_grpc}" ]]; then
     echo "less"
+    std_version='11'
     install_grpc_version=${old_grpc_version}
 fi
 if ! type cmake > /dev/null; then
@@ -52,7 +60,7 @@ cmake -DCMAKE_BUILD_TYPE=Release  \
 make -j${nproc} install && popd
 mkdir -p build && pushd build
 cmake -DgRPC_INSTALL=ON \
-    -DCMAKE_CXX_STANDARD=11 \
+    -DCMAKE_CXX_STANDARD=${std_version} \
     -DgRPC_BUILD_TESTS=OFF \
     -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
     -DCMAKE_PREFIX_PATH=$INSTALL_DIR \