Skip to content

Commit 3b3026f

Browse files
authored
[CI] Update Qt to 6.9.1 (shadps4-emu#3037)
1 parent 0e9420a commit 3b3026f

File tree

1 file changed

+10
-20
lines changed

1 file changed

+10
-20
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,13 @@ jobs:
7676
${{ env.cache-name }}-
7777
7878
- name: Cache CMake Build
79-
uses: hendrikmuhs/[email protected].17
79+
uses: hendrikmuhs/[email protected].18
8080
env:
8181
cache-name: ${{ runner.os }}-sdl-cache-cmake-build
8282
with:
8383
append-timestamp: false
8484
key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
8585

86-
- name: Setup VS Environment
87-
uses: ilammy/[email protected]
88-
with:
89-
arch: amd64
90-
9186
- name: Configure CMake
9287
run: cmake --fresh -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
9388

@@ -111,7 +106,7 @@ jobs:
111106
- name: Setup Qt
112107
uses: jurplel/install-qt-action@v4
113108
with:
114-
version: 6.9.0
109+
version: 6.9.1
115110
host: windows
116111
target: desktop
117112
arch: win64_msvc2022_64
@@ -130,18 +125,13 @@ jobs:
130125
${{ env.cache-name }}-
131126
132127
- name: Cache CMake Build
133-
uses: hendrikmuhs/[email protected].17
128+
uses: hendrikmuhs/[email protected].18
134129
env:
135130
cache-name: ${{ runner.os }}-qt-cache-cmake-build
136131
with:
137132
append-timestamp: false
138133
key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
139134

140-
- name: Setup VS Environment
141-
uses: ilammy/[email protected]
142-
with:
143-
arch: amd64
144-
145135
- name: Configure CMake
146136
run: cmake --fresh -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_QT_GUI=ON -DENABLE_UPDATER=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
147137

@@ -186,7 +176,7 @@ jobs:
186176
${{ env.cache-name }}-
187177
188178
- name: Cache CMake Build
189-
uses: hendrikmuhs/[email protected].17
179+
uses: hendrikmuhs/[email protected].18
190180
env:
191181
cache-name: ${{runner.os}}-sdl-cache-cmake-build
192182
with:
@@ -228,7 +218,7 @@ jobs:
228218
- name: Setup Qt
229219
uses: jurplel/install-qt-action@v4
230220
with:
231-
version: 6.9.0
221+
version: 6.9.1
232222
host: mac
233223
target: desktop
234224
arch: clang_64
@@ -247,7 +237,7 @@ jobs:
247237
${{ env.cache-name }}-
248238
249239
- name: Cache CMake Build
250-
uses: hendrikmuhs/[email protected].17
240+
uses: hendrikmuhs/[email protected].18
251241
env:
252242
cache-name: ${{runner.os}}-qt-cache-cmake-build
253243
with:
@@ -301,7 +291,7 @@ jobs:
301291
${{ env.cache-name }}-
302292
303293
- name: Cache CMake Build
304-
uses: hendrikmuhs/[email protected].17
294+
uses: hendrikmuhs/[email protected].18
305295
env:
306296
cache-name: ${{ runner.os }}-sdl-cache-cmake-build
307297
with:
@@ -362,7 +352,7 @@ jobs:
362352
${{ env.cache-name }}-
363353
364354
- name: Cache CMake Build
365-
uses: hendrikmuhs/[email protected].17
355+
uses: hendrikmuhs/[email protected].18
366356
env:
367357
cache-name: ${{ runner.os }}-qt-cache-cmake-build
368358
with:
@@ -409,7 +399,7 @@ jobs:
409399
${{ env.cache-name }}-
410400
411401
- name: Cache CMake Build
412-
uses: hendrikmuhs/[email protected].17
402+
uses: hendrikmuhs/[email protected].18
413403
env:
414404
cache-name: ${{ runner.os }}-sdl-gcc-cache-cmake-build
415405
with:
@@ -445,7 +435,7 @@ jobs:
445435
${{ env.cache-name }}-
446436
447437
- name: Cache CMake Build
448-
uses: hendrikmuhs/[email protected].17
438+
uses: hendrikmuhs/[email protected].18
449439
env:
450440
cache-name: ${{ runner.os }}-qt-gcc-cache-cmake-build
451441
with:

0 commit comments

Comments
 (0)