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

[CI] Upgrade to abseil 20240116.1 (CMake only) #2599

Merged
merged 12 commits into from
Mar 28, 2024
Merged

[CI] Upgrade to abseil 20240116.1 (CMake only) #2599

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d05ed23
Upgrade to abseil 20240116.1
marcalff Mar 21, 2024
e658b65
Merge branch 'main' into fix_upgrade_abseil
ThomsonTan Mar 21, 2024
2c9bb12
Merge branch 'main' into fix_upgrade_abseil
marcalff Mar 21, 2024
47db4d0
Tentative fix, OPENTELEMETRY_HAVE_ABSEIL
marcalff Mar 21, 2024
44b5881
Merge branch 'main' into fix_upgrade_abseil
marcalff Mar 22, 2024
fe80b67
Merge branch 'main' into fix_upgrade_abseil
marcalff Mar 26, 2024
9273459
Tentative cleanup
marcalff Mar 26, 2024
3940253
WIP
marcalff Mar 26, 2024
68549f0
Tentative fix.
marcalff Mar 26, 2024
e6c0591
Merge branch 'main' into fix_upgrade_abseil
marcalff Mar 28, 2024
b0626b5
Masive rollback.
marcalff Mar 28, 2024
969c3b3
Merge branch 'main' into fix_upgrade_abseil
marcalff Mar 28, 2024
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 = "3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a",
strip_prefix = "abseil-cpp-20240116.1",
urls = [
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20240116.1.tar.gz",
],
)

Expand Down
2 changes: 1 addition & 1 deletion ci/do_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ elif [[ "$1" == "code.coverage" ]]; then
exit 0
elif [[ "$1" == "third_party.tags" ]]; then
echo "gRPC=v1.49.2" > third_party_release
echo "abseil=20220623.1" >> third_party_release
echo "abseil=20240116.1" >> third_party_release
git submodule foreach --quiet 'echo "$name=$(git describe --tags HEAD)"' | sed 's:.*/::' >> third_party_release
exit 0
fi
Expand Down
2 changes: 1 addition & 1 deletion ci/install_abseil.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

set -ex
export DEBIAN_FRONTEND=noninteractive
[ -z "${ABSEIL_CPP_VERSION}" ] && export ABSEIL_CPP_VERSION="20220623.1"
[ -z "${ABSEIL_CPP_VERSION}" ] && export ABSEIL_CPP_VERSION="20240116.1"

BUILD_DIR=/tmp/
INSTALL_DIR=/usr/local/
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 @@ -14,7 +14,7 @@
#

gRPC=v1.49.2
abseil=20220623.1
abseil=20240116.1
benchmark=v1.7.1
googletest=1.14.0
ms-gsl=v3.1.0-67-g6f45293
Expand Down
Loading