From c45b5f97e5fd25717d55e49294c27c97c5052097 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Sun, 15 Feb 2026 20:48:48 +0300 Subject: [PATCH 1/2] fix caching --- .github/workflows/analyzers.yml | 4 ++-- .github/workflows/ci v2.yml | 13 ++++++++++--- conanfile.py | 1 - 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index f7404413a..fd8da5083 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -37,7 +37,7 @@ jobs: uses: turtlebrowser/get-conan@main - name: cache deps - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ env.CONAN_HOME }} key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} @@ -109,7 +109,7 @@ jobs: uses: turtlebrowser/get-conan@main - name: cache deps - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ env.CONAN_HOME }} key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index edf9c8cd1..779efe702 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -45,7 +45,7 @@ jobs: uses: turtlebrowser/get-conan@main - name: check cache - uses: actions/cache@v4 + uses: actions/cache/restore@v5 id: check_cache with: path: ${{ env.CONAN_HOME }} @@ -71,6 +71,13 @@ jobs: with: configurePreset: ${{ matrix.config.name }}-tests configurePresetAdditionalArgs: "['-DCMAKE_BUILD_TYPE=${{ matrix.build_type.config }}', '-DCMAKE_CONFIGURATION_TYPES=${{ matrix.build_type.config }}']" + + - name: Force Save Cache + if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' + uses: actions/cache/save@v5 + with: + path: ${{ env.CONAN_HOME }} + key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} sanitize: needs: ["cache_deps"] @@ -106,7 +113,7 @@ jobs: uses: turtlebrowser/get-conan@main - name: cache deps - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ env.CONAN_HOME }} key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} @@ -183,7 +190,7 @@ jobs: uses: turtlebrowser/get-conan@main - name: cache deps - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ env.CONAN_HOME }} key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} diff --git a/conanfile.py b/conanfile.py index 6b4fad0fc..f928eaff2 100644 --- a/conanfile.py +++ b/conanfile.py @@ -45,7 +45,6 @@ def requirements(self): if self.options.with_grpc: 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) if self.options.with_asio: From b55c19183495950b22ec76266bf79fe0c2b17054 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 15 Feb 2026 17:49:11 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/ci v2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 779efe702..fb6810fe2 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -71,7 +71,7 @@ jobs: with: configurePreset: ${{ matrix.config.name }}-tests configurePresetAdditionalArgs: "['-DCMAKE_BUILD_TYPE=${{ matrix.build_type.config }}', '-DCMAKE_CONFIGURATION_TYPES=${{ matrix.build_type.config }}']" - + - name: Force Save Cache if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' uses: actions/cache/save@v5