From 088d4b8c130f773ac8850e416bab22978ac75f17 Mon Sep 17 00:00:00 2001 From: Pierric Gimmig Date: Thu, 5 Oct 2023 00:48:24 -0700 Subject: [PATCH] Change order of conan dependency to fix Windows build (#4851) --- .github/workflows/build-and-test.yml | 2 +- conanfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 35da0ac7dca..43023787369 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -13,7 +13,7 @@ on: - 'cmake/**' - 'src/**' - 'third_party/**' - - 'conanfile.*' + - 'conanfile.py' pull_request: branches: - 'main' diff --git a/conanfile.py b/conanfile.py index 95da4204e13..8535b815fb2 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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):