Skip to content

Commit

Permalink
Merge branch 'main' into Building-OTLP-exporter-from-the-release-tarball
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomsonTan committed Nov 10, 2021
2 parents 1586e38 + 55aa7ea commit 109c93b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 1 deletion.
1 change: 1 addition & 0 deletions ci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CI tests can be run on docker by invoking the script `./ci/run_docker.sh
checker.
* `benchmark`: run all benchmarks.
* `format`: use `tools/format.sh` to enforce text formatting.
* `third_party.tags`: store third_party release tags.
* `code.coverage`: build cmake targets with CXX option `--coverage` and run
tests.

Expand Down
6 changes: 6 additions & 0 deletions ci/do_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,12 @@ 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" == "third_party.tags" ]]; then
echo "gRPC=v1.39.1" > third_party_release
echo "thrift=0.14.1" >> third_party_release
echo "abseil=20210324.0" >> third_party_release
git submodule status | sed 's:.*/::' | sed 's/ (/=/g' | sed 's/)//g' >> third_party_release
exit 0
fi

echo "Invalid do_ci.sh target, see ci/README.md for valid targets."
Expand Down
10 changes: 10 additions & 0 deletions third_party_release
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
gRPC=v1.39.1
thrift=0.14.1
abseil=20210324.0
benchmark=v1.5.3
googletest=release-1.8.0-2523-ga6dfd3ac
ms-gsl=v1.0.0-393-g6f45293
nlohmann-json=v3.9.1
opentelemetry-proto=v0.11.0
prometheus-cpp=v0.11.0
vcpkg=2020.04-2702-g5568f110b

0 comments on commit 109c93b

Please sign in to comment.