Skip to content

Commit faa9280

Browse files
committed
set cache key with qt version, fix push rc
1 parent 63b25d4 commit faa9280

2 files changed

Lines changed: 6 additions & 11 deletions

File tree

.github/workflows/pull-request-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: jurplel/install-qt-action@v4
3434
with:
3535
cache: true
36-
cache-key-prefix: install-qt-action-${{ matrix.config.name }}-${{ matrix.qtversion.value }}
36+
cache-key-prefix: install-qt-action-${{ matrix.config.name }}-6.2.9
3737
version: 6.2.0
3838

3939
- name: Prepare directories

.github/workflows/release-candidate-push-ci.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
matrix:
2020
config:
2121
- { name: "Windows MSVC", suffix: "Windows", os: windows-latest, cc: "cl.exe", cxx: "cl.exe", assimp: "OFF" }
22-
- { name: "Ubuntu gcc", suffix: "Linux-gcc10", os: ubuntu-20.04, cc: "gcc-10", cxx: "g++-10", assimp: "ON" }
22+
- { name: "Ubuntu gcc", suffix: "Ubuntu-gcc", os: ubuntu-24.04, cc: "gcc", cxx: "g++", assimp: "ON" }
2323
- { name: "MacOS clang", suffix: "macOS", os: macos-latest, cc: "clang", cxx: "clang++", assimp: "ON" }
2424

2525
steps:
@@ -29,17 +29,12 @@ jobs:
2929
uses: seanmiddleditch/gha-setup-vsdevenv@master
3030
if: runner.os == 'Windows'
3131

32-
- name: Cache Qt
33-
id: cache-qt
34-
uses: actions/cache@v2
35-
with:
36-
path: ../Qt
37-
key: ${{ runner.os }}-${{ matrix.config.cc }}-QtCache
38-
3932
- name: Install Qt
40-
uses: jurplel/install-qt-action@v2
33+
uses: jurplel/install-qt-action@v4
4134
with:
42-
cached: ${{ steps.cache-qt.outputs.cache-hit }}
35+
cache: true
36+
cache-key-prefix: install-qt-action-${{ matrix.config.name }}-6.2.9
37+
version: 6.2.0
4338

4439
- name: Prepare directories
4540
run: |

0 commit comments

Comments
 (0)