Fix broken CI builds

topfreegames · Jul 9, 2024 · 00c4c39 · 00c4c39
1 parent 0f2a526
commit 00c4c39
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -33,10 +33,11 @@ jobs:
             arch: armv8
             cppstd: gnu17
     runs-on: ${{ matrix.os }}
-    steps:
     - name: Install Conan
       id: conan
       uses: turtlebrowser/get-conan@main
+      env:
+        PIP_BREAK_SYSTEM_PACKAGES: 1
 
     - name: Update conan profile
       run: conan profile detect

diff --git a/cpp-lib/conanfile.py b/cpp-lib/conanfile.py
@@ -33,8 +33,8 @@ class PitayaCpp(ConanFile):
     exports = 'version.txt'
 
     def requirements(self):
-        self.requires("zlib/1.2.13")
-        self.requires("protobuf/3.21.12", force=True)
+        self.requires("zlib/1.3.1")
+        self.requires("protobuf/3.21.9", visible=True, force=True)
         self.requires("boost/1.83.0", force=True)
         self.requires("openssl/3.2.1", force=True)
         self.requires("grpc/1.54.3")
@@ -44,6 +44,7 @@ def requirements(self):
 
     def build_requirements(self):
         self.tool_requires("grpc/1.54.3")
+        self.tool_requires("protobuf/3.21.9")
 
     def layout(self):
         cmake_layout(self, build_folder='_builds')