Skip to content

[pull] main from open-telemetry:main #359

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

Merged
merged 1 commit into from
Apr 1, 2025
Merged

[pull] main from open-telemetry:main #359

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
77 changes: 58 additions & 19 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
# CXX: /usr/bin/g++-10
# run: |
# sudo -E ./ci/setup_gcc10.sh
# sudo -E ./ci/setup_cmake.sh
# sudo -E ./ci/setup_ci_environment.sh
# sudo -E ./ci/setup_cmake.sh
# sudo -E ./ci/setup_googletest.sh
# sudo -E ./ci/install_abseil.sh
# sudo -E ./ci/install_protobuf.sh
Expand All @@ -51,8 +51,9 @@ jobs:
submodules: 'recursive'
- name: setup
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run cmake tests
run: |
./ci/do_ci.sh cmake.test
Expand All @@ -71,8 +72,9 @@ jobs:
PROTOBUF_VERSION: 21.12
run: |
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/install_protobuf.sh
- name: setup grpc
run: |
Expand Down Expand Up @@ -107,8 +109,9 @@ jobs:
PROTOBUF_VERSION: 21.12
run: |
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/install_protobuf.sh
- name: setup grpc
run: |
Expand Down Expand Up @@ -143,8 +146,9 @@ jobs:
PROTOBUF_VERSION: 21.12
run: |
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/install_protobuf.sh
- name: setup grpc
run: |
Expand Down Expand Up @@ -179,8 +183,9 @@ jobs:
PROTOBUF_VERSION: 21.12
run: |
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/install_protobuf.sh
- name: setup grpc
run: |
Expand Down Expand Up @@ -215,8 +220,9 @@ jobs:
PROTOBUF_VERSION: 21.12
run: |
sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/install_protobuf.sh
- name: setup grpc
run: |
Expand Down Expand Up @@ -246,6 +252,7 @@ jobs:
submodules: 'recursive'
- name: setup
run: |
./ci/setup_cmake.ps1
./ci/setup_windows_ci_environment.ps1
- name: run tests
run: ./ci/do_ci.ps1 cmake.maintainer.test
Expand All @@ -259,6 +266,7 @@ jobs:
submodules: 'recursive'
- name: setup
run: |
./ci/setup_cmake.ps1
./ci/setup_windows_ci_environment.ps1
- name: run tests
env:
Expand All @@ -274,6 +282,7 @@ jobs:
submodules: 'recursive'
- name: setup
run: |
./ci/setup_cmake.ps1
./ci/setup_windows_ci_environment.ps1
- name: run tests
env:
Expand All @@ -292,8 +301,9 @@ jobs:
CC: /usr/bin/gcc-12
CXX: /usr/bin/g++-12
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run cmake tests (without otlp-exporter)
env:
CC: /usr/bin/gcc-12
Expand All @@ -310,8 +320,10 @@ jobs:
# submodules: 'recursive'
# - name: setup
# run: |
# sudo -E ./ci/setup_googletest.sh

# sudo -E ./ci/setup_ci_environment.sh
# sudo -E ./ci/setup_cmake.sh
# sudo -E ./ci/setup_googletest.sh
# - name: run cmake tests (enable abseil-cpp)
# run: |
# sudo ./ci/install_abseil.sh
Expand All @@ -326,8 +338,9 @@ jobs:
submodules: 'recursive'
- name: setup
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run cmake tests (enable opentracing-shim)
run: ./ci/do_ci.sh cmake.opentracing_shim.test

Expand All @@ -341,6 +354,7 @@ jobs:
- name: setup
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests (enable stl)
env:
Expand All @@ -357,6 +371,7 @@ jobs:
- name: setup
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests (enable stl)
env:
Expand All @@ -373,6 +388,7 @@ jobs:
- name: setup
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests
env:
Expand All @@ -397,6 +413,7 @@ jobs:
CXXFLAGS: "-stdlib=libc++"
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests
env:
Expand All @@ -423,6 +440,7 @@ jobs:
- name: setup
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests
env:
Expand All @@ -447,6 +465,7 @@ jobs:
CXXFLAGS: "-stdlib=libc++"
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests
env:
Expand All @@ -472,8 +491,9 @@ jobs:
submodules: 'recursive'
- name: setup
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run otlp exporter tests
run: |
sudo ./ci/setup_grpc.sh
Expand Down Expand Up @@ -501,8 +521,9 @@ jobs:
ABSEIL_CPP_VERSION: '20230125.3'
CXX_STANDARD: '14'
run: |
sudo ./ci/setup_googletest.sh
sudo ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/install_abseil.sh
sudo -E ./ci/install_protobuf.sh
- name: run otlp exporter tests
Expand All @@ -522,8 +543,9 @@ jobs:
submodules: 'recursive'
- name: setup
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run otlp exporter tests
run: |
sudo ./ci/setup_grpc.sh
Expand All @@ -538,8 +560,9 @@ jobs:
submodules: 'recursive'
- name: setup
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run otlp exporter tests
run: |
sudo ./ci/setup_grpc.sh -T
Expand All @@ -554,8 +577,9 @@ jobs:
# submodules: 'recursive'
# - name: setup
# run: |
# sudo -E ./ci/setup_googletest.sh
# sudo -E ./ci/setup_ci_environment.sh
# sudo -E ./ci/setup_cmake.sh
# sudo -E ./ci/setup_googletest.sh
# - name: run cmake install (with abseil)
# run: |
# sudo ./ci/install_abseil.sh
Expand All @@ -576,8 +600,9 @@ jobs:
CC: /usr/bin/gcc-12
CXX: /usr/bin/g++-12
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests
env:
CC: /usr/bin/gcc-12
Expand All @@ -601,6 +626,7 @@ jobs:
- name: setup
run: |
sudo ./ci/setup_ci_environment.sh
sudo ./ci/setup_cmake.sh
sudo ./ci/install_bazelisk.sh
- name: run tests
run: ./ci/do_ci.sh bazel.test
Expand All @@ -622,6 +648,7 @@ jobs:
- name: setup
run: |
sudo ./ci/setup_ci_environment.sh
sudo ./ci/setup_cmake.sh
sudo ./ci/install_bazelisk.sh
- name: run tests
run: ./ci/do_ci.sh bazel.no_bzlmod.test
Expand All @@ -643,6 +670,7 @@ jobs:
- name: setup
run: |
sudo ./ci/setup_ci_environment.sh
sudo ./ci/setup_cmake.sh
sudo ./ci/install_bazelisk.sh
- name: run tests
run: ./ci/do_ci.sh bazel.with_async_export.test
Expand All @@ -664,6 +692,7 @@ jobs:
- name: setup
run: |
sudo ./ci/setup_ci_environment.sh
sudo ./ci/setup_cmake.sh
sudo ./ci/install_bazelisk.sh
- name: run tests
run: ./ci/do_ci.sh bazel.valgrind
Expand All @@ -685,6 +714,7 @@ jobs:
- name: setup
run: |
sudo ./ci/setup_ci_environment.sh
sudo ./ci/setup_cmake.sh
sudo ./ci/install_bazelisk.sh
- name: run tests
run: ./ci/do_ci.sh bazel.noexcept
Expand All @@ -706,6 +736,7 @@ jobs:
- name: setup
run: |
sudo ./ci/setup_ci_environment.sh
sudo ./ci/setup_cmake.sh
sudo ./ci/install_bazelisk.sh
- name: run tests
run: ./ci/do_ci.sh bazel.nortti
Expand All @@ -727,6 +758,7 @@ jobs:
- name: setup
run: |
sudo ./ci/setup_ci_environment.sh
sudo ./ci/setup_cmake.sh
sudo ./ci/install_bazelisk.sh
- name: run tests
run: ./ci/do_ci.sh bazel.asan
Expand All @@ -748,6 +780,7 @@ jobs:
- name: setup
run: |
sudo ./ci/setup_ci_environment.sh
sudo ./ci/setup_cmake.sh
sudo ./ci/install_bazelisk.sh
- name: run tests
run: ./ci/do_ci.sh bazel.tsan
Expand Down Expand Up @@ -824,6 +857,7 @@ jobs:
submodules: 'recursive'
- name: setup
run: |
./ci/setup_cmake.ps1
./ci/setup_windows_ci_environment.ps1
./ci/install_windows_protobuf.ps1
- name: run cmake test
Expand All @@ -840,6 +874,7 @@ jobs:
submodules: 'recursive'
- name: setup
run: |
./ci/setup_cmake.ps1
./ci/setup_windows_ci_environment.ps1
./ci/install_windows_protobuf.ps1
- name: run cmake test (DLL build)
Expand All @@ -858,6 +893,7 @@ jobs:
submodules: 'recursive'
- name: setup
run: |
./ci/setup_cmake.ps1
./ci/setup_windows_ci_environment.ps1
./ci/install_windows_protobuf.ps1
- name: run cmake test
Expand Down Expand Up @@ -887,6 +923,7 @@ jobs:
submodules: 'recursive'
- name: setup
run: |
./ci/setup_cmake.ps1
./ci/setup_windows_ci_environment.ps1
- name: run tests
run: ./ci/do_ci.ps1 cmake.test_example_plugin
Expand All @@ -903,8 +940,9 @@ jobs:
CC: /usr/bin/gcc-10
CXX: /usr/bin/g++-10
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests and generate report
env:
CC: /usr/bin/gcc-10
Expand Down Expand Up @@ -974,8 +1012,9 @@ jobs:
CC: /usr/bin/gcc-12
CXX: /usr/bin/g++-12
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: run w3c trace-context test server (background)
env:
CXX_STANDARD: '14'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/iwyu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
sudo apt install -y --no-install-recommends --no-install-suggests \
build-essential \
iwyu \
cmake \
ninja-build \
libssl-dev \
libcurl4-openssl-dev \
Expand All @@ -30,6 +29,8 @@ jobs:
libgmock-dev \
libgtest-dev \
libbenchmark-dev
sudo ./ci/setup_cmake.sh


- name: setup grpc
run: |
Expand Down
15 changes: 15 additions & 0 deletions ci/setup_cmake.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

$ErrorActionPreference = "Stop"
trap { $host.SetShouldExit(1) }

if (-not $env:CMAKE_VERSION) { $env:CMAKE_VERSION = "3.31.6" }
$CMAKE_VERSION = $env:CMAKE_VERSION

choco uninstall cmake cmake.install -y --remove-dependencies --skip-autouninstaller --force --no-progress

Write-Host "Installing CMake version $CMAKE_VERSION ..."
choco install cmake --version=$CMAKE_VERSION --allow-downgrade -y --force --no-progress

cmake --version
Loading
Loading