Skip to content

Commit 096d0ea

Browse files
committed
Tentative cleanup
1 parent 46687e4 commit 096d0ea

File tree

3 files changed

+21
-15
lines changed

3 files changed

+21
-15
lines changed

.github/workflows/ci.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -317,19 +317,25 @@ jobs:
317317
# sudo ./ci/install_abseil.sh
318318
# ./ci/do_ci.sh cmake.abseil.test
319319

320-
cmake_opentracing_shim_test:
321-
name: CMake test (with opentracing-shim)
322-
runs-on: ubuntu-latest
323-
steps:
324-
- uses: actions/checkout@v4
325-
with:
326-
submodules: 'recursive'
327-
- name: setup
328-
run: |
329-
sudo -E ./ci/setup_googletest.sh
330-
sudo -E ./ci/setup_ci_environment.sh
331-
- name: run cmake tests (enable opentracing-shim)
332-
run: ./ci/do_ci.sh cmake.opentracing_shim.test
320+
# As of 2025-04-01 (!), github workers use CMake 4.0.0
321+
# CMake 4.0.0 no longer supports cmake_minimum_required
322+
# for CMake < 3.5
323+
# The opentracing-cpp library requires CMake 3.1,
324+
# which fails to build in CI for Ubuntu 22 and 24.
325+
#
326+
# cmake_opentracing_shim_test:
327+
# name: CMake test (with opentracing-shim)
328+
# runs-on: ubuntu-latest
329+
# steps:
330+
# - uses: actions/checkout@v4
331+
# with:
332+
# submodules: 'recursive'
333+
# - name: setup
334+
# run: |
335+
# sudo -E ./ci/setup_googletest.sh
336+
# sudo -E ./ci/setup_ci_environment.sh
337+
# - name: run cmake tests (enable opentracing-shim)
338+
# run: ./ci/do_ci.sh cmake.opentracing_shim.test
333339

334340
cmake_test_cxx14_gcc:
335341
name: CMake C++14 test(GCC)

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bazel_dep(name = "opentelemetry-proto", version = "1.5.0", repo_name = "com_gith
1717
bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
1818
bazel_dep(name = "platforms", version = "0.0.8")
1919
bazel_dep(name = "prometheus-cpp", version = "1.3.0", repo_name = "com_github_jupp0r_prometheus_cpp")
20-
bazel_dep(name = "protobuf", version = "26.0", repo_name = "com_google_protobuf")
20+
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
2121
bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
2222
bazel_dep(name = "zlib", version = "1.3.1.bcr.1")
2323

ci/install_protobuf.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -e
77

8-
[ -z "${PROTOBUF_VERSION}" ] && export PROTOBUF_VERSION="21.12"
8+
[ -z "${PROTOBUF_VERSION}" ] && export PROTOBUF_VERSION="29.0"
99

1010
#
1111
# Note

0 commit comments

Comments
 (0)