default v1.48.1

open-telemetry · Sep 15, 2022 · cb64d1a · cb64d1a
1 parent fd42d12
commit cb64d1a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -146,22 +146,6 @@ jobs:
         sudo ./ci/setup_grpc.sh
         ./ci/do_ci.sh cmake.exporter.otprotocol.test
 
-  cmake_grpc_latest_test:
-    name: CMake test (with otlp-exporter and latest gRPC release)
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        sudo ./ci/setup_cmake.sh
-        sudo ./ci/setup_ci_environment.sh
-    - name: run otlp exporter tests
-      run: |
-        sudo ./ci/setup_grpc.sh -r v1.48.1
-        ./ci/do_ci.sh cmake.exporter.otlp.grpc.latest.test
-
   plugin_test:
     name: Plugin -> CMake
     runs-on: ubuntu-latest

diff --git a/ci/do_ci.sh b/ci/do_ci.sh
@@ -334,19 +334,6 @@ elif [[ "$1" == "code.coverage" ]]; then
   lcov --remove coverage.info '*/ext/http/server/*'> tmp_coverage.info 2>/dev/null
   cp tmp_coverage.info coverage.info
   exit 0
-elif [[ "$1" == "cmake.exporter.otlp.grpc.latest.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake -DCMAKE_BUILD_TYPE=Debug  \
-        -DWITH_OTLP=ON \
-        -DENABLE_LOGS_PREVIEW=ON \
-        "${SRC_DIR}"
-  grpc_cpp_plugin=`which grpc_cpp_plugin`
-  proto_make_file="CMakeFiles/opentelemetry_proto.dir/build.make"
-  sed -i "s~gRPC_CPP_PLUGIN_EXECUTABLE-NOTFOUND~$grpc_cpp_plugin~" ${proto_make_file} #fixme
-  make -j $(nproc)
-  cd exporters/otlp && make test
-  exit 0
 elif [[ "$1" == "third_party.tags" ]]; then
   echo "gRPC=v1.43.2" > third_party_release
   echo "thrift=0.14.1" >> third_party_release

diff --git a/ci/setup_grpc.sh b/ci/setup_grpc.sh
@@ -6,15 +6,15 @@
 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='11'
+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:r:" o; do
+while getopts ":v:i:r:s:" o; do
     case "${o}" in
         v)
             gcc_version=${OPTARG}
@@ -24,7 +24,9 @@ while getopts ":v:i:r:" o; do
             ;;
         r)
             install_grpc_version=${OPTARG}
-            std_version='14'
+            ;;
+        s)
+            std_version=${OPTARG}
             ;;
         *)
             usage
@@ -36,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