Skip to content

Commit 08bed04

Browse files
committed
UPD | workflow
1 parent 86f94cb commit 08bed04

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

.github/workflows/conan_build_and_test.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,17 @@ jobs:
5454
uses: actions/cache/restore@v4
5555
with:
5656
path: /home/runner/.conan2
57-
key: conan-${{ runner.os }}-${{ matrix.c_compiler }}
57+
key: conan-${{ runner.os }}-${{ matrix.c_compiler }}-${{ matrix.library_type }}
5858

5959
- name: Cache Conan Dependencies (Windows Latest)
6060
if: ${{ matrix.os == 'windows-latest' }}
6161
id: cache-conan-windows
6262
uses: actions/cache@v4
6363
with:
6464
path: C:\Users\runneradmin\.conan2
65-
key: conan-${{ runner.os }}-${{ matrix.c_compiler }}
65+
key: conan-${{ runner.os }}-${{ matrix.c_compiler }}-${{ matrix.library_type }}
6666

67-
- if: ${{ matrix.os == 'ubuntu-latest' && steps.cache-conan-ubuntu.outputs.cache-hit != 'true' }}
68-
name: Create default Conan profile
69-
run: conan profile detect --force
70-
71-
- if: ${{ matrix.os == 'windows-latest' && steps.cache-conan-windows.outputs.cache-hit != 'true' }}
67+
- if: ${{ (matrix.os == 'ubuntu-latest' && steps.cache-conan-ubuntu.outputs.cache-hit != 'true') || (matrix.os == 'windows-latest' && steps.cache-conan-windows.outputs.cache-hit != 'true') }}
7268
name: Create default Conan profile
7369
run: conan profile detect --force
7470

0 commit comments

Comments
 (0)