From afd9c211e724ff1d24183c378fab25bb4aa083da Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 13 Feb 2026 16:16:36 +0300 Subject: [PATCH 1/8] try fix caching --- .github/workflows/analyzers.yml | 11 +++++------ .github/workflows/ci v2.yml | 15 ++++++--------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index 9d8511234..a952438a5 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -7,6 +7,9 @@ on: types: - completed +env: + CONAN_USER_HOME: "${{ github.workspace }}/release/" + CONAN_USER_HOME_SHORT: "${{ github.workspace }}/release/short" jobs: pvs: @@ -37,9 +40,7 @@ jobs: - name: cache deps uses: actions/cache@v4 with: - path: | - ~/.conan2 - /Users/runner/.conan2/ + path: ${{ env.CONAN_USER_HOME }} key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} restore-keys: deps-ci-ubuntu-clang-Release @@ -111,9 +112,7 @@ jobs: - name: cache deps uses: actions/cache@v4 with: - path: | - ~/.conan2 - /Users/runner/.conan2/ + path: ${{ env.CONAN_USER_HOME }} key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} restore-keys: deps-ci-ubuntu-clang-Release diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index a566c9ce9..85d2815a8 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -16,6 +16,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true +env: + CONAN_USER_HOME: "${{ github.workspace }}/release/" + CONAN_USER_HOME_SHORT: "${{ github.workspace }}/release/short" jobs: cache_deps: @@ -46,9 +49,7 @@ jobs: uses: actions/cache@v4 id: check_cache with: - path: | - ~/.conan2 - /Users/runner/.conan2/ + path: ${{ env.CONAN_USER_HOME }} key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} restore-keys: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }} lookup-only: true @@ -108,9 +109,7 @@ jobs: - name: cache deps uses: actions/cache@v4 with: - path: | - ~/.conan2 - /Users/runner/.conan2/ + path: ${{ env.CONAN_USER_HOME }} key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} restore-keys: deps-ci-ubuntu-clang-Release @@ -187,9 +186,7 @@ jobs: - name: cache deps uses: actions/cache@v4 with: - path: | - ~/.conan2 - /Users/runner/.conan2/ + path: ${{ env.CONAN_USER_HOME }} key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} restore-keys: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }} From 6f8d9de50ac343bb47e2d4bf4b26fc286d86fe6e Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 13 Feb 2026 16:26:18 +0300 Subject: [PATCH 2/8] fix --- .github/workflows/analyzers.yml | 7 +++---- .github/workflows/ci v2.yml | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index a952438a5..f7404413a 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -8,8 +8,7 @@ on: - completed env: - CONAN_USER_HOME: "${{ github.workspace }}/release/" - CONAN_USER_HOME_SHORT: "${{ github.workspace }}/release/short" + CONAN_HOME: "${{ github.workspace }}/release/" jobs: pvs: @@ -40,7 +39,7 @@ jobs: - name: cache deps uses: actions/cache@v4 with: - path: ${{ env.CONAN_USER_HOME }} + path: ${{ env.CONAN_HOME }} key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} restore-keys: deps-ci-ubuntu-clang-Release @@ -112,7 +111,7 @@ jobs: - name: cache deps uses: actions/cache@v4 with: - path: ${{ env.CONAN_USER_HOME }} + path: ${{ env.CONAN_HOME }} key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} restore-keys: deps-ci-ubuntu-clang-Release diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 85d2815a8..edf9c8cd1 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -17,8 +17,7 @@ concurrency: cancel-in-progress: true env: - CONAN_USER_HOME: "${{ github.workspace }}/release/" - CONAN_USER_HOME_SHORT: "${{ github.workspace }}/release/short" + CONAN_HOME: "${{ github.workspace }}/release/" jobs: cache_deps: @@ -49,7 +48,7 @@ jobs: uses: actions/cache@v4 id: check_cache with: - path: ${{ env.CONAN_USER_HOME }} + path: ${{ env.CONAN_HOME }} key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} restore-keys: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }} lookup-only: true @@ -109,7 +108,7 @@ jobs: - name: cache deps uses: actions/cache@v4 with: - path: ${{ env.CONAN_USER_HOME }} + path: ${{ env.CONAN_HOME }} key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} restore-keys: deps-ci-ubuntu-clang-Release @@ -186,7 +185,7 @@ jobs: - name: cache deps uses: actions/cache@v4 with: - path: ${{ env.CONAN_USER_HOME }} + path: ${{ env.CONAN_HOME }} key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} restore-keys: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }} From edea1fb3ccc900ef355d19d3e62f5b1d346cd940 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 13 Feb 2026 18:17:34 +0300 Subject: [PATCH 3/8] Update conanfile.py --- conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 1606e6c4b..1f93e5fa4 100644 --- a/conanfile.py +++ b/conanfile.py @@ -44,9 +44,9 @@ def requirements(self): # self.requires("sfml/2.6.2", options={"audio": False}) if self.options.with_grpc: - self.requires("grpc/1.65.0", transitive_libs=True, transitive_headers=True) - # self.requires("protobuf/5.26.1") - self.requires("libmount/2.39", override=True) + self.requires("grpc/1.72.0", transitive_libs=True, transitive_headers=True) + self.requires("protobuf/6.32.1") + # self.requires("libmount/2.39", override=True) if self.options.with_asio: self.requires("asio/1.30.2") From 6b9d26ad750c053b1faddf5bf3e3c83f2b588e86 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 13 Feb 2026 18:35:27 +0300 Subject: [PATCH 4/8] Update conanfile.py --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 1f93e5fa4..70ac1811d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -45,7 +45,7 @@ def requirements(self): if self.options.with_grpc: self.requires("grpc/1.72.0", transitive_libs=True, transitive_headers=True) - self.requires("protobuf/6.32.1") + # self.requires("protobuf/6.32.1") # self.requires("libmount/2.39", override=True) if self.options.with_asio: From 9d599872f5597426dde2ac74d12e90d609df2d85 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 13 Feb 2026 19:51:50 +0300 Subject: [PATCH 5/8] Update conanfile.py --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 70ac1811d..93e56b713 100644 --- a/conanfile.py +++ b/conanfile.py @@ -44,7 +44,7 @@ def requirements(self): # self.requires("sfml/2.6.2", options={"audio": False}) if self.options.with_grpc: - self.requires("grpc/1.72.0", transitive_libs=True, transitive_headers=True) + self.requires("grpc/1.70.0", transitive_libs=True, transitive_headers=True) # self.requires("protobuf/6.32.1") # self.requires("libmount/2.39", override=True) From 4e2030937b90de72c169353111f9fc934651600f Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 13 Feb 2026 20:09:01 +0300 Subject: [PATCH 6/8] Update conanfile.py --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 93e56b713..2b9e76618 100644 --- a/conanfile.py +++ b/conanfile.py @@ -44,7 +44,7 @@ def requirements(self): # self.requires("sfml/2.6.2", options={"audio": False}) if self.options.with_grpc: - self.requires("grpc/1.70.0", transitive_libs=True, transitive_headers=True) + self.requires("grpc/1.67.1", transitive_libs=True, transitive_headers=True) # self.requires("protobuf/6.32.1") # self.requires("libmount/2.39", override=True) From 968d315ee91847bdedb86f3299f460b06d468871 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 13 Feb 2026 20:21:17 +0300 Subject: [PATCH 7/8] Update conanfile.py --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 2b9e76618..6b4fad0fc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -44,9 +44,9 @@ def requirements(self): # self.requires("sfml/2.6.2", options={"audio": False}) if self.options.with_grpc: - self.requires("grpc/1.67.1", transitive_libs=True, transitive_headers=True) + self.requires("grpc/1.65.0", transitive_libs=True, transitive_headers=True) # self.requires("protobuf/6.32.1") - # self.requires("libmount/2.39", override=True) + self.requires("libmount/2.39", override=True) if self.options.with_asio: self.requires("asio/1.30.2") From 268074967b21b1c6c04c4d224ab4878c9a5aad78 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 13 Feb 2026 20:23:57 +0300 Subject: [PATCH 8/8] fix dev --- CMakePresets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index bcce987ac..b0f8b9e4e 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -17,7 +17,7 @@ "systemVars": false }, "errors": { - "dev": true, + "dev": false, "deprecated": false } },