From 80aafa22ec60ba9d99a9888de65f75522bec5796 Mon Sep 17 00:00:00 2001 From: LordGrey Date: Mon, 7 Nov 2022 21:55:27 +0100 Subject: [PATCH] Update for install-qt-action@v3 --- .github/workflows/pull-request.yml | 12 +++--------- .github/workflows/push-master.yml | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ca4bb8a6..92870ad1 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -136,20 +136,14 @@ jobs: tr -d '\n' < .version > temp && mv temp .version echo -n "+PR${{ github.event.pull_request.number }}" >> .version - - name: Cache Qt - uses: actions/cache@v3 - id: cache-qt-windows - with: - path: ${{ runner.workspace }}/Qt - key: ${{ runner.os }}-Qt.${{ env.QT_VERSION }} - - name: Install Qt - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: version: ${{env.QT_VERSION}} target: 'desktop' arch: 'win64_msvc2019_64' - cached: ${{ steps.cache-qt-windows.outputs.cache-hit }} + cache: 'true' + cache-key-prefix: 'cache-qt-windows' - name: Cache Chocolatey downloads uses: actions/cache@v3 diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml index 99d0dffa..44d99d7e 100644 --- a/.github/workflows/push-master.yml +++ b/.github/workflows/push-master.yml @@ -101,20 +101,14 @@ jobs: with: submodules: true - - name: Cache Qt - uses: actions/cache@v3 - id: cache-qt-windows - with: - path: ${{ runner.workspace }}/Qt - key: ${{ runner.os }}-Qt.${{ env.QT_VERSION }} - - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: ${{ env.QT_VERSION }} + version: ${{env.QT_VERSION}} target: 'desktop' arch: 'win64_msvc2019_64' - cached: ${{ steps.cache-qt-windows.outputs.cache-hit }} + cache: 'true' + cache-key-prefix: 'cache-qt-windows' - name: Cache Chocolatey downloads uses: actions/cache@v3