diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index 9d8511234..f7404413a 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -7,6 +7,8 @@ on: types: - completed +env: + CONAN_HOME: "${{ github.workspace }}/release/" jobs: pvs: @@ -37,9 +39,7 @@ jobs: - name: cache deps uses: actions/cache@v4 with: - path: | - ~/.conan2 - /Users/runner/.conan2/ + path: ${{ env.CONAN_HOME }} key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} restore-keys: deps-ci-ubuntu-clang-Release @@ -111,9 +111,7 @@ jobs: - name: cache deps uses: actions/cache@v4 with: - path: | - ~/.conan2 - /Users/runner/.conan2/ + 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 a566c9ce9..edf9c8cd1 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -16,6 +16,8 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true +env: + CONAN_HOME: "${{ github.workspace }}/release/" jobs: cache_deps: @@ -46,9 +48,7 @@ jobs: uses: actions/cache@v4 id: check_cache with: - path: | - ~/.conan2 - /Users/runner/.conan2/ + 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 @@ -108,9 +108,7 @@ jobs: - name: cache deps uses: actions/cache@v4 with: - path: | - ~/.conan2 - /Users/runner/.conan2/ + path: ${{ env.CONAN_HOME }} key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} restore-keys: deps-ci-ubuntu-clang-Release @@ -187,9 +185,7 @@ jobs: - name: cache deps uses: actions/cache@v4 with: - path: | - ~/.conan2 - /Users/runner/.conan2/ + 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 }} 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 } }, diff --git a/conanfile.py b/conanfile.py index 1606e6c4b..6b4fad0fc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -45,7 +45,7 @@ def requirements(self): 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("protobuf/6.32.1") self.requires("libmount/2.39", override=True) if self.options.with_asio: