File tree Expand file tree Collapse file tree 3 files changed +5
-10
lines changed
Expand file tree Collapse file tree 3 files changed +5
-10
lines changed Original file line number Diff line number Diff line change @@ -237,8 +237,7 @@ jobs:
237237 submodules : ' recursive'
238238 - name : Install Conan
239239 run : |
240- python3 -m pip install --upgrade pip
241- pip install "conan>=2.0,<3"
240+ brew install conan
242241 conan profile detect --force
243242 - name : Install or build all dependencies with Conan
244243 run : conan install install/conan/conanfile_stable.txt --build=missing -of /Users/runner/conan -s build_type=Debug
@@ -263,12 +262,9 @@ jobs:
263262 submodules : ' recursive'
264263 - name : Install Dependencies with Homebrew
265264 run : |
266- brew install cmake
267265 brew install coreutils
268- brew install wget
269266 brew install googletest
270267 brew install google-benchmark
271- brew install curl
272268 brew install zlib
273269 brew install abseil
274270 brew install protobuf
Original file line number Diff line number Diff line change @@ -732,6 +732,7 @@ message(STATUS "CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD}")
732732if (CMAKE_TOOLCHAIN_FILE)
733733 message (STATUS "CMAKE_TOOLCHAIN_FILE: ${CMAKE_TOOLCHAIN_FILE} " )
734734endif ()
735+ message (STATUS "BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS} " )
735736message (STATUS "Architecture: ${ARCH} " )
736737message (STATUS "---------------------------------------------" )
737738message (STATUS "Build Options" )
@@ -758,10 +759,8 @@ message(STATUS "WITH_ZIPKIN: ${WITH_ZIPKIN}")
758759message (STATUS "WITH_PROMETHEUS: ${WITH_PROMETHEUS} " )
759760message (STATUS "WITH_ELASTICSEARCH: ${WITH_ELASTICSEARCH} " )
760761message (STATUS "WITH_OPENTRACING: ${WITH_OPENTRACING} " )
761- if (WIN32 )
762- message (STATUS "WITH_ETW: ${WITH_ETW} " )
763- message (STATUS "OPENTELEMETRY_BUILD_DLL: ${OPENTELEMETRY_BUILD_DLL} " )
764- endif ()
762+ message (STATUS "WITH_ETW: ${WITH_ETW} " )
763+ message (STATUS "OPENTELEMETRY_BUILD_DLL: ${OPENTELEMETRY_BUILD_DLL} " )
765764
766765message (STATUS "---------------------------------------------" )
767766message (STATUS "Feature preview options" )
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ zlib/1.3.1
33libcurl/8.12.1
44abseil/20240116.2
55protobuf/5.27.0
6- grpc/1.69.0
6+ grpc/1.67.1
77nlohmann_json/3.11.3
88prometheus-cpp/1.3.0
99
You can’t perform that action at this time.
0 commit comments