Skip to content

[CI] Upgrade abseil-cpp version from 20220623.1 to 20230125.2 #2117

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

Closed
cngzhnp wants to merge 1 commit into from
Closed

[CI] Upgrade abseil-cpp version from 20220623.1 to 20230125.2 #2117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions bazel/repository.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ def opentelemetry_cpp_deps():
maybe(
http_archive,
name = "com_google_absl",
sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8",
strip_prefix = "abseil-cpp-20220623.1",
sha256 = "9a2b5752d7bfade0bdeee2701de17c9480620f8b237e1964c1b9967c75374906",
strip_prefix = "abseil-cpp-20230125.2",
urls = [
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.2.tar.gz",
],
)

Expand Down
5 changes: 3 additions & 2 deletions ci/do_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ mkdir -p "${BUILD_DIR}"
mkdir -p "${PLUGIN_DIR}"

BAZEL_OPTIONS_DEFAULT="--copt=-DENABLE_LOGS_PREVIEW --copt=-DENABLE_TEST --copt=-DENABLE_METRICS_EXEMPLAR_PREVIEW"
BAZEL_OPTIONS="--cxxopt=-std=c++14 $BAZEL_OPTIONS_DEFAULT"
BAZEL_OPTIONS="--cxxopt=-std=c++14 --host_cxxopt=-std=c++14 $BAZEL_OPTIONS_DEFAULT"

BAZEL_TEST_OPTIONS="$BAZEL_OPTIONS --test_output=errors"

Expand Down Expand Up @@ -163,6 +163,7 @@ elif [[ "$1" == "cmake.abseil.test" ]]; then
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
-DWITH_ABSEIL=ON \
-DCMAKE_CXX_STANDARD=14 \
"${SRC_DIR}"
make -j $(nproc)
make test
Expand Down Expand Up @@ -413,7 +414,7 @@ elif [[ "$1" == "code.coverage" ]]; then
elif [[ "$1" == "third_party.tags" ]]; then
echo "gRPC=v1.49.2" > third_party_release
echo "thrift=0.14.1" >> third_party_release
echo "abseil=20220623.1" >> third_party_release
echo "abseil=20230125.2" >> third_party_release
git submodule foreach --quiet 'echo "$name=$(git describe --tags HEAD)"' | sed 's:.*/::' >> third_party_release
exit 0
fi
Expand Down
4 changes: 2 additions & 2 deletions ci/install_abseil.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ export DEBIAN_FRONTEND=noninteractive

BUILD_DIR=/tmp/
INSTALL_DIR=/usr/local/
TAG=20220623.1
TAG=20230125.2
pushd $BUILD_DIR
git clone --depth=1 -b ${TAG} https://github.com/abseil/abseil-cpp.git
cd abseil-cpp
mkdir build && pushd build
cmake -DBUILD_TESTING=OFF -DCMAKE_CXX_STANDARD=11 \
cmake -DBUILD_TESTING=OFF -DCMAKE_CXX_STANDARD=14 \
-DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
..
make -j $(nproc)
Expand Down
2 changes: 1 addition & 1 deletion third_party_release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

gRPC=v1.49.2
thrift=0.14.1
abseil=20220623.1
abseil=20230125.2
benchmark=v1.5.3
googletest=release-1.12.1
ms-gsl=v3.1.0-67-g6f45293
Expand Down