Skip to content

Commit cf37011

Browse files
committed
downgrade the latest conan grpc version to one that builds. fix conan install on macos
1 parent a83299c commit cf37011

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

.github/workflows/cmake_install.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff 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

CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,7 @@ message(STATUS "CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD}")
732732
if(CMAKE_TOOLCHAIN_FILE)
733733
message(STATUS "CMAKE_TOOLCHAIN_FILE: ${CMAKE_TOOLCHAIN_FILE}")
734734
endif()
735+
message(STATUS "BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
735736
message(STATUS "Architecture: ${ARCH}")
736737
message(STATUS "---------------------------------------------")
737738
message(STATUS "Build Options")
@@ -758,10 +759,8 @@ message(STATUS "WITH_ZIPKIN: ${WITH_ZIPKIN}")
758759
message(STATUS "WITH_PROMETHEUS: ${WITH_PROMETHEUS}")
759760
message(STATUS "WITH_ELASTICSEARCH: ${WITH_ELASTICSEARCH}")
760761
message(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

766765
message(STATUS "---------------------------------------------")
767766
message(STATUS "Feature preview options")

install/conan/conanfile_latest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ zlib/1.3.1
33
libcurl/8.12.1
44
abseil/20240116.2
55
protobuf/5.27.0
6-
grpc/1.69.0
6+
grpc/1.67.1
77
nlohmann_json/3.11.3
88
prometheus-cpp/1.3.0
99

0 commit comments

Comments
 (0)