Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump gRPC to v1.48.1 for CMake Linux CI #1608

Merged
merged 10 commits into from
Sep 26, 2022
Merged

bump gRPC to v1.48.1 for CMake Linux CI #1608

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6ad45a9
gRPC latest release test
esigo Sep 10, 2022
ec4ba21
c++ 14
esigo Sep 10, 2022
728e4f3
fix CI
esigo Sep 10, 2022
030524c
clean
esigo Sep 10, 2022
3370876
Merge branch 'main' into gRPC-latest
lalitb Sep 12, 2022
8953ef6
Merge branch 'main' into gRPC-latest
lalitb Sep 12, 2022
94fbd87
Merge branch 'main' into gRPC-latest
esigo Sep 13, 2022
fd42d12
Merge branch 'open-telemetry:main' into gRPC-latest
esigo Sep 15, 2022
cb64d1a
default v1.48.1
esigo Sep 15, 2022
b2e82b6
Merge branch 'main' into gRPC-latest
ThomsonTan Sep 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,22 @@ 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
Expand Down
13 changes: 13 additions & 0 deletions ci/do_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,19 @@ 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
Expand Down
9 changes: 7 additions & 2 deletions ci/setup_grpc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,24 @@ export DEBIAN_FRONTEND=noninteractive
old_grpc_version='v1.33.2'
new_grpc_version='v1.43.2'
gcc_version_for_new_grpc='5.1'
std_version='11'
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:" o; do
case "${o}" in
v)
gcc_version=${OPTARG}
;;
i)
install_dir=${OPTARG}
;;
r)
install_grpc_version=${OPTARG}
std_version='14'
;;
*)
usage
;;
Expand Down Expand Up @@ -52,7 +57,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 \
Expand Down