Skip to content

Commit b221f18

Browse files
committed
grpc upgrade
1 parent 1f31341 commit b221f18

File tree

3 files changed

+62
-2
lines changed

3 files changed

+62
-2
lines changed

.github/workflows/ci.yml

+23-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
./ci/do_ci.sh cmake.abseil.test
4141
4242
cmake_gcc_48_test:
43-
name: CMake gcc 4.8
43+
name: CMake gcc 4.8 (without otlp exporter)
4444
runs-on: ubuntu-18.04
4545
steps:
4646
- uses: actions/checkout@v2
@@ -59,6 +59,28 @@ jobs:
5959
CC: /usr/bin/gcc-4.8
6060
CXX: /usr/bin/g++-4.8
6161

62+
cmake_gcc_48_otlp_exporter_test:
63+
name: CMake gcc 4.8 (with otlp exporter)
64+
runs-on: ubuntu-18.04
65+
steps:
66+
- uses: actions/checkout@v2
67+
with:
68+
submodules: 'recursive'
69+
- name: setup
70+
run: |
71+
sudo ./ci/setup_ci_environment.sh
72+
sudo ./ci/install_gcc48.sh
73+
- name: setup cmake
74+
run: |
75+
sudo CC=/usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 ./ci/setup_cmake.sh
76+
- name: setup grpc
77+
sudo CC=/usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 ./ci/setup_grpc.sh -v 4.8
78+
- name: run tests
79+
run: ./ci/do_ci.sh cmake.legacy.exporter.otprotocol.test
80+
env:
81+
CC: /usr/bin/gcc-4.8
82+
CXX: /usr/bin/g++-4.8
83+
6284
cmake_test_cxx20:
6385
name: CMake C++20 test
6486
runs-on: ubuntu-20.04

ci/do_ci.sh

+14
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,20 @@ elif [[ "$1" == "cmake.legacy.test" ]]; then
9292
make
9393
make test
9494
exit 0
95+
elif [[ "$1" == "cmake.legacy.exporter.otprotocol.test" ]]; then
96+
cd "${BUILD_DIR}"
97+
rm -rf *
98+
cmake -DCMAKE_BUILD_TYPE=Debug \
99+
-DCMAKE_CXX_FLAGS="-Werror" \
100+
-DCMAKE_CXX_STANDARD=11 \
101+
-DWITH_OTLP=ON \
102+
"${SRC_DIR}"
103+
grpc_cpp_plugin=`which grpc_cpp_plugin`
104+
proto_make_file="CMakeFiles/opentelemetry_proto.dir/build.make"
105+
sed -i "s~gRPC_CPP_PLUGIN_EXECUTABLE-NOTFOUND~$grpc_cpp_plugin~" ${proto_make_file} #fixme
106+
make -j $(nproc)
107+
cd exporters/otlp && make test
108+
exit 0
95109
elif [[ "$1" == "cmake.exporter.otprotocol.test" ]]; then
96110
cd "${BUILD_DIR}"
97111
rm -rf *

ci/setup_grpc.sh

+25-1
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,39 @@
55

66
set -e
77
export DEBIAN_FRONTEND=noninteractive
8+
old_grpc_version='v1.34.0'
9+
new_grpc_version='v1.39.0'
10+
gcc_version_for_new_grpc='5.1'
11+
install_grpc_version=${new_grpc_version}
12+
grpc_version='v1.39.0'
13+
usage() { echo "Usage: $0 -v <gcc-version>" 1>&2; exit 1; }
814

15+
while getopts ":v:" o; do
16+
case "${o}" in
17+
v)
18+
gcc_version=${OPTARG}
19+
;;
20+
*)
21+
usage
22+
;;
23+
esac
24+
done
25+
if [ -z "${gcc_version}" ]; then
26+
gcc_version=`gcc --version | awk '/gcc/ {print $NF}'`
27+
fi
28+
if [[ "${gcc_version}" < "${gcc_version_for_new_grpc}" ]]; then
29+
echo "less"
30+
install_grpc_version=${old_grpc_version}
31+
fi
932
if ! type cmake > /dev/null; then
1033
#cmake not installed, exiting
1134
exit 1
1235
fi
1336
export BUILD_DIR=/tmp/
1437
export INSTALL_DIR=/usr/local/
1538
pushd $BUILD_DIR
16-
git clone --depth=1 -b v1.34.0 https://github.com/grpc/grpc
39+
echo "installing grpc version: ${install_grpc_version}"
40+
git clone --depth=1 -b ${install_grpc_version} https://github.com/grpc/grpc
1741
cd grpc
1842
git submodule init
1943
git submodule update --depth 1

0 commit comments

Comments
 (0)