Skip to content

Commit

Permalink
Change order of conan dependency to fix Windows build (#4851)
Browse files Browse the repository at this point in the history
  • Loading branch information
pierricgimmig authored Oct 5, 2023
1 parent f047972 commit 088d4b8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- 'cmake/**'
- 'src/**'
- 'third_party/**'
- 'conanfile.*'
- 'conanfile.py'
pull_request:
branches:
- 'main'
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ def config_options(self):

def build_requirements(self):
if self.options.with_system_deps: return
self.build_requires('protobuf/3.21.4')
self.build_requires('grpc/1.48.0')
self.build_requires('protobuf/3.21.4')
self.build_requires('gtest/1.11.0', force_host_context=True)

def requirements(self):
Expand Down

0 comments on commit 088d4b8

Please sign in to comment.