Skip to content

Commit ba8de98

Browse files
committed
changed caching key names
1 parent e233249 commit ba8de98

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

.github/workflows/build_cmake.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
${{ env.CONAN_USER_HOME }}
5454
~/.cache/pip
5555
~/.ccache
56-
key: ${{ runner.os }}-${{ matrix.buildtype }}-${{ hashFiles('conanfile.py') }}
56+
key: ${{ runner.os }}-${{ matrix.compiler.preset }}-${{ matrix.buildtype }}-${{ hashFiles('conanfile.py') }}
5757

5858
- name: Install conan
5959
shell: bash
@@ -108,7 +108,7 @@ jobs:
108108
${{ env.CONAN_USER_HOME }}
109109
~/.cache/pip
110110
~/.ccache
111-
key: ${{ runner.os }}-${{ matrix.buildtype }}-${{ hashFiles('conanfile.py') }}
111+
key: ${{ runner.os }}-${{ matrix.compiler.preset }}-${{ matrix.buildtype }}-${{ hashFiles('conanfile.py') }}
112112

113113
- name: Install conan
114114
shell: bash
@@ -157,7 +157,7 @@ jobs:
157157
${{ env.CONAN_USER_HOME }}
158158
~/.cache/pip
159159
~/.ccache
160-
key: ${{ runner.os }}-${{ matrix.buildtype }}-${{ hashFiles('conanfile.py') }}
160+
key: ${{ runner.os }}-${{ matrix.compiler.preset }}-${{ matrix.buildtype }}-${{ hashFiles('conanfile.py') }}
161161

162162
- name: Install conan
163163
shell: bash
@@ -214,7 +214,7 @@ jobs:
214214
${{ env.CONAN_USER_HOME }}
215215
~/.cache/pip
216216
~/.ccache
217-
key: ${{ runner.os }}-${{ matrix.buildtype }}-${{ hashFiles('cmake/Conan.cmake') }}
217+
key: ${{ runner.os }}-${{ matrix.compiler.preset }}-${{ matrix.buildtype }}-${{ hashFiles('conanfile.py') }}
218218

219219
- name: Install conan
220220
shell: bash
@@ -265,7 +265,7 @@ jobs:
265265
${{ env.CONAN_USER_HOME }}
266266
~/.cache/pip
267267
~/.ccache
268-
key: ${{ runner.os }}-${{ matrix.buildtype }}-${{ hashFiles('cmake/Conan.cmake') }}
268+
key: ${{ runner.os }}-${{ matrix.compiler.preset }}-${{ matrix.buildtype }}-${{ hashFiles('conanfile.py') }}
269269

270270
- name: Install conan
271271
shell: bash
@@ -296,18 +296,12 @@ jobs:
296296
matrix:
297297
os: [ubuntu-22.04]
298298
buildtype: [debug]
299-
compiler: [ {name: 'Clang 15', preset: clang-15, pkgs: 'clang-15 llvm-15'} ]
299+
compiler: [ {name: 'Clang 15', preset: clang-15-qt, pkgs: 'clang-15 llvm-15'} ]
300300
cxx: [20]
301301

302302
steps:
303303
- uses: actions/checkout@v4
304304

305-
- name: Install conan
306-
shell: bash
307-
run: |
308-
python3 -m pip install --upgrade pip setuptools conan
309-
source ~/.profile
310-
311305
- name: Cache
312306
uses: actions/cache@v4
313307
env:
@@ -317,7 +311,13 @@ jobs:
317311
${{ env.CONAN_USER_HOME }}
318312
~/.cache/pip
319313
~/.ccache
320-
key: ${{ runner.os }}-${{ matrix.buildtype }}-${{ hashFiles('cmake/Conan.cmake') }}
314+
key: ${{ runner.os }}-${{ matrix.compiler.preset }}-${{ matrix.buildtype }}-${{ hashFiles('conanfile.py') }}
315+
316+
- name: Install conan
317+
shell: bash
318+
run: |
319+
python3 -m pip install --upgrade pip setuptools conan
320+
source ~/.profile
321321
322322
- name: Install dependencies
323323
run: |
@@ -335,12 +335,12 @@ jobs:
335335

336336
- name: Configure via CMake
337337
shell: bash
338-
run: cmake --preset ${{ matrix.compiler.preset }}-qt -DCXX_STANDARD=${{ matrix.cxx }}
338+
run: cmake --preset ${{ matrix.compiler.preset }} -DCXX_STANDARD=${{ matrix.cxx }}
339339

340340
- name: Build
341341
shell: bash
342-
run: cmake --build --preset build-${{ matrix.compiler.preset }}-qt
342+
run: cmake --build --preset build-${{ matrix.compiler.preset }}
343343

344344
- name: Test
345345
shell: bash
346-
run: ctest --preset test-${{ matrix.compiler.preset }}-qt
346+
run: ctest --preset test-${{ matrix.compiler.preset }}

0 commit comments

Comments
 (0)