Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions bazel/google_cloud_cpp_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,11 @@ def google_cloud_cpp_deps(name = None):
http_archive,
name = "io_opentelemetry_cpp",
urls = [
"https://storage.googleapis.com/cloud-cpp-community-archive/io_opentelemetry_cpp/v1.8.2.tar.gz",
"https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.2.tar.gz",
"https://storage.googleapis.com/cloud-cpp-community-archive/io_opentelemetry_cpp/v1.8.3.tar.gz",
"https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.3.tar.gz",
],
sha256 = "20fa97e507d067e9e2ab0c1accfc334f5a4b10d01312e55455dc3733748585f4",
strip_prefix = "opentelemetry-cpp-1.8.2",
sha256 = "b23d3c80d2e0012734ea343d2be69b2a7139ec5545453c503b13e629eb8fbe05",
strip_prefix = "opentelemetry-cpp-1.8.3",
)

# PugiXML, this is only used in the docfx internal tool.
Expand Down
3 changes: 2 additions & 1 deletion ci/cloudbuild/dockerfiles/centos-7.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ RUN curl -sSL https://github.com/google/benchmark/archive/v1.7.0.tar.gz | \
ldconfig && cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/
RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.2.tar.gz | \
RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.3.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_CXX_STANDARD=14 \
Expand All @@ -175,6 +175,7 @@ RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.2
-DWITH_EXAMPLES=OFF \
-DWITH_ABSEIL=ON \
-DBUILD_TESTING=OFF \
-DOPENTELEMETRY_INSTALL=ON \
-H. -Bcmake-out -GNinja && \
cmake --build cmake-out --target install && \
ldconfig && cd /var/tmp && rm -fr build
Expand Down
3 changes: 2 additions & 1 deletion ci/cloudbuild/dockerfiles/fedora-37-cmake.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ RUN curl -sSL https://github.com/grpc/grpc/archive/v1.52.1.tar.gz | \
ldconfig && cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/
RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.2.tar.gz | \
RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.3.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_CXX_STANDARD=14 \
Expand All @@ -180,6 +180,7 @@ RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.2
-DWITH_EXAMPLES=OFF \
-DWITH_ABSEIL=ON \
-DBUILD_TESTING=OFF \
-DOPENTELEMETRY_INSTALL=ON \
-H. -Bcmake-out -GNinja && \
cmake --build cmake-out --target install && \
ldconfig && cd /var/tmp && rm -fr build
Expand Down
3 changes: 2 additions & 1 deletion ci/cloudbuild/dockerfiles/fedora-37-cxx14.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ RUN curl -sSL https://github.com/grpc/grpc/archive/v1.52.1.tar.gz | \
cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/
RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.2.tar.gz | \
RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.3.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_CXX_STANDARD=14 \
Expand All @@ -189,6 +189,7 @@ RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.2
-DWITH_EXAMPLES=OFF \
-DWITH_ABSEIL=ON \
-DBUILD_TESTING=OFF \
-DOPENTELEMETRY_INSTALL=ON \
-H. -Bcmake-out -GNinja && \
cmake --build cmake-out --target install && \
ldconfig && cd /var/tmp && rm -fr build
Expand Down
3 changes: 2 additions & 1 deletion ci/cloudbuild/dockerfiles/fedora-37-cxx20.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ RUN curl -sSL https://github.com/grpc/grpc/archive/v1.52.1.tar.gz | \
cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/
RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.2.tar.gz | \
RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.3.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_CXX_STANDARD=20 \
Expand All @@ -191,6 +191,7 @@ RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.2
-DWITH_EXAMPLES=OFF \
-DWITH_ABSEIL=ON \
-DBUILD_TESTING=OFF \
-DOPENTELEMETRY_INSTALL=ON \
-H. -Bcmake-out -GNinja && \
cmake --build cmake-out --target install && \
ldconfig && cd /var/tmp && rm -fr build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ RUN curl -sSL https://github.com/grpc/grpc/archive/v1.52.1.tar.gz | \
cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/
RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.2.tar.gz | \
RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.3.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_CXX_STANDARD=14 \
Expand All @@ -190,6 +190,7 @@ RUN curl -sSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.8.2
-DWITH_EXAMPLES=OFF \
-DWITH_ABSEIL=ON \
-DBUILD_TESTING=OFF \
-DOPENTELEMETRY_INSTALL=ON \
-H. -Bcmake-out -GNinja && \
cmake --build cmake-out --target install && \
ldconfig && cd /var/tmp && rm -fr build
Expand Down