From c462cf2fe8e6c94e8db1de58276d77b52e6bbc03 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Tue, 14 May 2024 16:24:55 +0300 Subject: [PATCH] use same cache name --- .github/workflows/analyzers.yml | 4 ++-- .../{cache_conan => cache_conan.yml} | 0 .github/workflows/ci v2.yml | 19 ++----------------- 3 files changed, 4 insertions(+), 19 deletions(-) rename .github/workflows/{cache_conan => cache_conan.yml} (100%) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index e208004b0..fc70e4793 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -46,7 +46,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - key: ${{ runner.os }}-conan-2 + key: conan-2-ci-ubuntu-clang-Release - name: run conan run: | @@ -128,7 +128,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - key: ${{ runner.os }}-conan-2 + key: conan-2-ci-ubuntu-clang-Release - name: run conan run: | diff --git a/.github/workflows/cache_conan b/.github/workflows/cache_conan.yml similarity index 100% rename from .github/workflows/cache_conan rename to .github/workflows/cache_conan.yml diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 631d432a9..a65032eb2 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -45,7 +45,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - key: ${{ runner.os }}-conan-2 + key: conan-2-ci-ubuntu-clang-Release - name: run conan run: | @@ -130,7 +130,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - key: ${{ runner.os }}-conan-2 + key: conan-2-${{ matrix.config.name }}-${{ matrix.build_type.config }} - name: run conan run: | @@ -210,21 +210,6 @@ jobs: with: cache: true - - name: get conan - uses: turtlebrowser/get-conan@main - - - name: cache conan - uses: actions/cache@v2 - with: - path: | - ~/.conan2 - /Users/runner/.conan2/ - key: ${{ runner.os }}-conan-2 - - - name: run conan - run: | - conan profile detect --force - - name: Install project and build env: CC: gcc-10