Skip to content

[CMAKE] clean up googletest and benchmark dependency management #3485

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 13 commits into from
Jul 4, 2025
Merged

[CMAKE] clean up googletest and benchmark dependency management #3485

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d4b1091
add support for adding googltest and benchmark from submodule or git …
dbarker Jun 17, 2025
6442655
Merge remote-tracking branch 'origin/main' into cmake_googletest_and_…
dbarker Jun 17, 2025
b068051
fix ci issues. set fPIC on opentracing builds. revert changes to the …
dbarker Jun 17, 2025
9506abc
Merge branch 'main' into cmake_googletest_and_benchmark_cleanup
dbarker Jun 23, 2025
21d5b8f
add changelog entry
dbarker Jun 24, 2025
4df5d8d
Merge remote-tracking branch 'origin/main' into cmake_googletest_and_…
dbarker Jun 24, 2025
302e335
Merge branch 'main' into cmake_googletest_and_benchmark_cleanup
marcalff Jun 25, 2025
020d8ef
Merge remote-tracking branch 'origin/main' into cmake_googletest_and_…
dbarker Jun 26, 2025
078d6c4
Merge remote-tracking branch 'origin/main' into cmake_googletest_and_…
dbarker Jun 28, 2025
e5cded2
Merge branch 'main' into cmake_googletest_and_benchmark_cleanup
dbarker Jun 30, 2025
7130d1e
Merge branch 'main' into cmake_googletest_and_benchmark_cleanup
ThomsonTan Jul 4, 2025
629efba
remove call to install_windows_deps
dbarker Jul 4, 2025
0b9730f
Merge branch 'main' into cmake_googletest_and_benchmark_cleanup
dbarker Jul 4, 2025
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
20 changes: 5 additions & 15 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: setup
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_googletest.sh
sudo -E apt-get install -y zlib1g-dev libcurl4-openssl-dev nlohmann-json3-dev
- name: run cmake tests
run: |
./ci/do_ci.sh cmake.test
Expand All @@ -72,11 +72,10 @@ jobs:
- name: setup
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_googletest.sh
- name: Install abseil, protobuf, and grpc with apt
- name: install dependencies
run: |
sudo -E apt-get update
sudo -E apt-get install -y libabsl-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
sudo -E apt-get install -y zlib1g-dev libcurl4-openssl-dev libabsl-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
- name: run fetch content cmake test
run: |
./ci/do_ci.sh cmake.fetch_content.test
Expand Down Expand Up @@ -362,7 +361,7 @@ jobs:
CXX: /usr/bin/g++-12
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_googletest.sh
sudo -E apt-get install -y zlib1g-dev libcurl4-openssl-dev
- name: run cmake tests (without otlp-exporter)
env:
CC: /usr/bin/gcc-12
Expand All @@ -385,7 +384,6 @@ jobs:
- name: setup
run: |
sudo -E ./ci/setup_ci_environment.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 @@ -404,7 +402,6 @@ jobs:
- name: setup
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests (enable stl)
env:
CXX_STANDARD: '14'
Expand All @@ -425,7 +422,6 @@ jobs:
- name: setup
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests (enable stl)
env:
CXX_STANDARD: '17'
Expand All @@ -446,7 +442,6 @@ jobs:
- name: setup
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests
env:
CXX_STANDARD: '20'
Expand Down Expand Up @@ -475,7 +470,6 @@ jobs:
CXXFLAGS: "-stdlib=libc++"
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests
env:
CC: /usr/bin/clang
Expand Down Expand Up @@ -506,7 +500,6 @@ jobs:
- name: setup
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests
env:
CXX_STANDARD: '23'
Expand Down Expand Up @@ -535,7 +528,6 @@ jobs:
CXXFLAGS: "-stdlib=libc++"
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests
env:
CC: /usr/bin/clang
Expand Down Expand Up @@ -670,7 +662,6 @@ jobs:
CXX: /usr/bin/g++-12
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests
env:
CC: /usr/bin/gcc-12
Expand Down Expand Up @@ -1087,7 +1078,6 @@ jobs:
CXX: /usr/bin/g++-10
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_googletest.sh
- name: run tests and generate report
env:
CC: /usr/bin/gcc-10
Expand Down Expand Up @@ -1183,7 +1173,7 @@ jobs:
CXX: /usr/bin/g++-12
run: |
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_googletest.sh
sudo -E apt-get install -y zlib1g-dev libcurl4-openssl-dev
- name: run w3c trace-context test server (background)
env:
CXX_STANDARD: '14'
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ jobs:
env:
CC: /usr/bin/gcc-12
CXX: /usr/bin/g++-12
GOOGLETEST_VERSION: 1.12.1
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
- name: Initialize CodeQL
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
Expand Down
Loading
Loading