Skip to content

Commit 9a75338

Browse files
committed
Try again
1 parent e52f1d7 commit 9a75338

1 file changed

Lines changed: 22 additions & 24 deletions

File tree

.github/workflows/test-pull_request.yaml

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -88,30 +88,28 @@ jobs:
8888
name: Checkout
8989
with:
9090
submodules: true
91-
# - name: Cache Qt
92-
# id: cache-qt-win
93-
# uses: actions/cache@v1
94-
# with:
95-
# path: ${{ github.workspace }}/../Qt
96-
# key: ${{ runner.os }}-${{ matrix.arch }}-QtCache-${{ env.QT_VERSION }}
97-
# - name: Install Qt (32 bit)
98-
# uses: jurplel/install-qt-action@v2
99-
# if: ${{ matrix.compiler == 'MSVC' && matrix.arch == 'Win32' }}
100-
# with:
101-
# version: ${{ env.QT_VERSION }}
102-
# dir: ${{ github.workspace }}/..
103-
# arch: win32_msvc2017
104-
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
105-
# aqtversion: ==0.8
106-
# - name: Install Qt (64 bit)
107-
# uses: jurplel/install-qt-action@v2
108-
# if: ${{ matrix.compiler == 'MSVC' && matrix.arch == 'x64' }}
109-
# with:
110-
# version: ${{ env.QT_VERSION }}
111-
# dir: ${{ github.workspace }}/..
112-
# arch: win64_msvc2017_64
113-
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
114-
# aqtversion: ==0.8
91+
- name: Cache Qt
92+
id: cache-qt-win
93+
uses: actions/cache@v1
94+
with:
95+
path: ${{ github.workspace }}/../Qt
96+
key: ${{ runner.os }}-${{ matrix.arch }}-QtCache-${{ env.QT_VERSION }}
97+
- name: Install Qt (32 bit)
98+
uses: jurplel/install-qt-action@v4
99+
if: ${{ matrix.compiler == 'MSVC' && matrix.arch == 'Win32' }}
100+
with:
101+
version: ${{ env.QT_VERSION }}
102+
dir: ${{ github.workspace }}/..
103+
arch: win32_msvc2022
104+
cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
105+
- name: Install Qt (64 bit)
106+
uses: jurplel/install-qt-action@v4
107+
if: ${{ matrix.compiler == 'MSVC' && matrix.arch == 'x64' }}
108+
with:
109+
version: ${{ env.QT_VERSION }}
110+
dir: ${{ github.workspace }}/..
111+
arch: win64_msvc2022_64
112+
cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
115113
- name: Prepare Vulkan SDK
116114
uses: humbletim/setup-vulkan-sdk@v1.2.1
117115
with:

0 commit comments

Comments
 (0)