Skip to content

Commit 88cad9b

Browse files
committed
add missing example builds. update stable conan versions
1 parent dec36f0 commit 88cad9b

File tree

4 files changed

+33
-29
lines changed

4 files changed

+33
-29
lines changed

.github/workflows/cmake_install.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
branches: [ main ]
99

1010
jobs:
11-
windows_2022_vcpkg:
12-
name: Windows 2022 vcpkg cxx17 (static libs - dll)
11+
windows_2022_vcpkg_submodule:
12+
name: Windows 2022 vcpkg submodule versions cxx17 (static libs - dll)
1313
runs-on: windows-2022
1414
env:
1515
CXX_STANDARD: '17'
@@ -26,8 +26,8 @@ jobs:
2626
- name: Run DLL Tests
2727
run: ./ci/do_ci.ps1 cmake.dll.install.test
2828

29-
windows_2019_vcpkg_min_cmake_version:
30-
name: Windows 2019 vcpkg cxx14 min cmake version (static libs)
29+
windows_2019_vcpkg_submodule_min_cmake:
30+
name: Windows 2019 vcpkg submodule versions minimum cmake cxx14 (static libs)
3131
runs-on: windows-2019
3232
env:
3333
CMAKE_VERSION: '3.16.0'
@@ -74,11 +74,15 @@ jobs:
7474
run: ./ci/do_ci.sh cmake.install.test
7575

7676
ubuntu_2404_latest:
77-
name: Ubuntu 24.04 latest cxx17 (static libs)
77+
name: Ubuntu 24.04 latest versions cxx20 (static libs)
7878
runs-on: ubuntu-24.04
7979
env:
8080
INSTALL_TEST_DIR: '/home/runner/install_test'
8181
CXX_STANDARD: '20'
82+
GOOGLETEST_VERSION: '1.16.0'
83+
ABSEIL_CPP_VERSION: '20240722.1'
84+
PROTOBUF_VERSION: '29.0'
85+
GRPC_VERSION: 'v1.71.0'
8286
BUILD_TYPE: 'Debug'
8387
steps:
8488
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -90,10 +94,6 @@ jobs:
9094
sudo -E ./ci/setup_cmake.sh
9195
sudo -E ./ci/setup_googletest.sh
9296
- name: Build abseil, protobuf, and grpc with ci scripts
93-
env:
94-
ABSEIL_CPP_VERSION: '20240722.1'
95-
PROTOBUF_VERSION: '29.0'
96-
GRPC_VERSION: 'v1.71.0'
9797
run: |
9898
sudo -E ./ci/install_abseil.sh
9999
sudo -E ./ci/install_protobuf.sh
@@ -104,12 +104,16 @@ jobs:
104104
run: ./ci/do_ci.sh cmake.install.test
105105

106106
ubuntu_2204_stable:
107-
name: Ubuntu 22.04 stable cxx17 (static libs - shared libs)
107+
name: Ubuntu 22.04 stable versions cxx17 (static libs - shared libs)
108108
runs-on: ubuntu-22.04
109109
env:
110110
INSTALL_TEST_DIR: '/home/runner/install_test'
111111
CMAKE_VERSION: '3.22.0'
112112
CXX_STANDARD: '17'
113+
GOOGLETEST_VERSION: '1.14.0'
114+
ABSEIL_CPP_VERSION: '20230125.3'
115+
PROTOBUF_VERSION: '23.3'
116+
GRPC_VERSION: 'v1.55.0'
113117
BUILD_TYPE: 'Debug'
114118
steps:
115119
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -121,10 +125,6 @@ jobs:
121125
sudo -E ./ci/setup_cmake.sh
122126
sudo -E ./ci/setup_googletest.sh
123127
- name: Build abseil, protobuf, and grpc with ci scripts
124-
env:
125-
ABSEIL_CPP_VERSION: '20230125.3'
126-
PROTOBUF_VERSION: '23.3'
127-
GRPC_VERSION: 'v1.55.0'
128128
run: |
129129
sudo -E ./ci/install_abseil.sh
130130
sudo -E ./ci/install_protobuf.sh
@@ -138,14 +138,17 @@ jobs:
138138
BUILD_SHARED_LIBS: 'ON'
139139
run: ./ci/do_ci.sh cmake.install.test
140140

141-
ubuntu_2204_min_versions:
142-
name: Ubuntu 22.04 min dependency versions (static libs - shared libs)
141+
ubuntu_2204_minimum:
142+
name: Ubuntu 22.04 minimum versions cxx14 (static libs - shared libs)
143143
runs-on: ubuntu-22.04
144144
env:
145145
INSTALL_TEST_DIR: '/home/runner/install_test'
146146
CMAKE_VERSION: '3.16.0'
147147
GOOGLETEST_VERSION: '1.11.0'
148148
CXX_STANDARD: '14'
149+
ABSEIL_CPP_VERSION: '20220623.2'
150+
PROTOBUF_VERSION: '21.12'
151+
GRPC_VERSION: 'v1.49.2'
149152
BUILD_TYPE: 'Debug'
150153
steps:
151154
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -157,10 +160,6 @@ jobs:
157160
sudo -E ./ci/setup_cmake.sh
158161
sudo -E ./ci/setup_googletest.sh
159162
- name: Build abseil, protobuf, and grpc with ci scripts
160-
env:
161-
ABSEIL_CPP_VERSION: '20220623.2'
162-
PROTOBUF_VERSION: '21.12'
163-
GRPC_VERSION: 'v1.49.2'
164163
run: |
165164
sudo -E ./ci/install_abseil.sh
166165
sudo -E ./ci/install_protobuf.sh
@@ -175,7 +174,7 @@ jobs:
175174
run: ./ci/do_ci.sh cmake.install.test
176175

177176
ubuntu_2404_conan_stable:
178-
name: Ubuntu 24.04 conan stable cxx17 (static libs - shared libs - opentracing shim)
177+
name: Ubuntu 24.04 conan stable versions cxx17 (static libs - shared libs - opentracing shim)
179178
runs-on: ubuntu-24.04
180179
env:
181180
INSTALL_TEST_DIR: '/home/runner/install_test'
@@ -195,7 +194,7 @@ jobs:
195194
- name: Install or build all dependencies with Conan
196195
run: |
197196
sudo -E ./ci/setup_cmake.sh
198-
conan install install/conan/conanfile_stable.txt --build=missing -of /home/runner/conan -s build_type=Debug
197+
conan install install/conan/conanfile_stable.txt --build=missing -of /home/runner/conan -s build_type=${BUILD_TYPE} -s compiler.cppstd=${CXX_STANDARD}
199198
- name: Run Tests (static libs)
200199
env:
201200
BUILD_SHARED_LIBS: 'OFF'
@@ -212,7 +211,7 @@ jobs:
212211
run: ./ci/do_ci.sh cmake.opentracing_shim.install.test
213212

214213
ubuntu_2404_conan_latest:
215-
name: Ubuntu 24.04 conan latest cxx17 (static libs)
214+
name: Ubuntu 24.04 conan latest versions cxx17 (static libs)
216215
runs-on: ubuntu-24.04
217216
env:
218217
INSTALL_TEST_DIR: '/home/runner/install_test'
@@ -231,7 +230,7 @@ jobs:
231230
- name: Install or build all dependencies with Conan
232231
run: |
233232
sudo -E ./ci/setup_cmake.sh
234-
conan install install/conan/conanfile_latest.txt --build=missing -of /home/runner/conan -s build_type=Debug
233+
conan install install/conan/conanfile_latest.txt --build=missing -of /home/runner/conan -s build_type=${BUILD_TYPE} -s compiler.cppstd=${CXX_STANDARD}
235234
- name: Run Tests (static libs)
236235
env:
237236
BUILD_SHARED_LIBS: 'OFF'
@@ -242,11 +241,12 @@ jobs:
242241
./ci/verify_packages.sh
243242
244243
macos_14_conan_stable:
245-
name: macOS 14 conan stable cxx17 (static libs)
244+
name: macOS 14 conan stable versions cxx17 (static libs)
246245
runs-on: macos-14
247246
env:
248247
INSTALL_TEST_DIR: '/Users/runner/install_test'
249248
CXX_STANDARD: '17'
249+
CMAKE_VERSION: '3.28.3'
250250
CMAKE_TOOLCHAIN_FILE: '/Users/runner/conan/build/Debug/generators/conan_toolchain.cmake'
251251
BUILD_TYPE: 'Debug'
252252
steps:
@@ -259,14 +259,14 @@ jobs:
259259
sudo -E ./ci/setup_cmake_macos.sh
260260
conan profile detect --force
261261
- name: Install or build all dependencies with Conan
262-
run: conan install install/conan/conanfile_stable.txt --build=missing -of /Users/runner/conan -s build_type=Debug
262+
run: conan install install/conan/conanfile_stable.txt --build=missing -of /Users/runner/conan -s build_type=${BUILD_TYPE} -s compiler.cppstd=${CXX_STANDARD}
263263
- name: Run Tests (static libs)
264264
env:
265265
BUILD_SHARED_LIBS: 'OFF'
266266
run: ./ci/do_ci.sh cmake.install.test
267267

268268
macos_14_brew_packages:
269-
name: macOS 14 brew packages cxx17 (static libs)
269+
name: macOS 14 brew latest versions cxx17 (static libs)
270270
runs-on: macos-14
271271
env:
272272
CXX_STANDARD: '17'

ci/do_ci.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,8 @@ switch ($action) {
388388
-DWITH_ELASTICSEARCH=ON `
389389
-DWITH_ETW=ON `
390390
-DWITH_EXAMPLES=ON `
391+
-DWITH_EXAMPLES_HTTP=ON `
392+
-DBUILD_W3CTRACECONTEXT_TEST=ON `
391393
-DOPENTELEMETRY_INSTALL=ON
392394

393395
$exit = $LASTEXITCODE

ci/do_ci.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,8 @@ elif [[ "$1" == "cmake.install.test" ]]; then
476476
-DWITH_ZIPKIN=ON \
477477
-DWITH_ELASTICSEARCH=ON \
478478
-DWITH_EXAMPLES=ON \
479+
-DWITH_EXAMPLES_HTTP=ON \
480+
-DBUILD_W3CTRACECONTEXT_TEST=ON \
479481
-DOPENTELEMETRY_INSTALL=ON \
480482
"${SRC_DIR}"
481483

install/conan/conanfile_stable.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ abseil/20230125.3
88
protobuf/3.21.12
99
grpc/1.54.3
1010
nlohmann_json/3.10.5
11-
prometheus-cpp/1.3.0
11+
prometheus-cpp/1.2.4
1212
opentracing-cpp/1.6.0
1313

1414
[options]
@@ -29,7 +29,7 @@ opentracing-cpp/*:shared=True
2929

3030
[test_requires]
3131
gtest/1.14.0
32-
benchmark/1.9.1
32+
benchmark/1.8.3
3333

3434
[generators]
3535
CMakeToolchain

0 commit comments

Comments
 (0)