Skip to content

Commit 87c7623

Browse files
committed
other workflows
1 parent 625a289 commit 87c7623

3 files changed

Lines changed: 24 additions & 30 deletions

File tree

.github/workflows/build-nightly.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'nightly_*'
77

88
env:
9-
QT_VERSION: 6.9.1
9+
QT_VERSION: 6.9.2
1010

1111
jobs:
1212
build_linux:
@@ -125,15 +125,13 @@ jobs:
125125
# arch: win32_msvc2017
126126
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
127127
# aqtversion: ==0.8
128-
# - name: Install Qt (64 bit)
129-
# uses: jurplel/install-qt-action@v2
130-
# if: ${{ matrix.arch == 'x64' }}
131-
# with:
132-
# version: ${{ env.QT_VERSION }}
133-
# dir: ${{ github.workspace }}/..
134-
# arch: win64_msvc2017_64
135-
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
136-
# aqtversion: ==0.8
128+
- name: Install Qt (64 bit)
129+
uses: jurplel/install-qt-action@v4
130+
if: ${{ matrix.arch == 'x64' }}
131+
with:
132+
version: ${{ env.QT_VERSION }}
133+
dir: ${{ github.workspace }}/..
134+
arch: win64_msvc2022_64
137135
- name: Prepare Vulkan SDK
138136
uses: humbletim/setup-vulkan-sdk@v1.2.1
139137
with:

.github/workflows/build-release.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release_*'
77

88
env:
9-
QT_VERSION: 6.9.1
9+
QT_VERSION: 6.9.2
1010

1111
jobs:
1212
create_release:
@@ -180,16 +180,14 @@ jobs:
180180
# arch: win32_msvc2017
181181
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
182182
# aqtversion: ==0.8
183-
# - name: Install Qt (64 bit)
183+
- name: Install Qt (64 bit)
184184
# # Install Qt 64bit if matrix.arch == x64
185-
# uses: jurplel/install-qt-action@v2
186-
# if: ${{ matrix.arch == 'x64' }}
187-
# with:
188-
# version: ${{ env.QT_VERSION }}
189-
# dir: ${{ github.workspace }}/..
190-
# arch: win64_msvc2017_64
191-
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
192-
# aqtversion: ==0.8
185+
uses: jurplel/install-qt-action@v4
186+
if: ${{ matrix.arch == 'x64' }}
187+
with:
188+
version: ${{ env.QT_VERSION }}
189+
dir: ${{ github.workspace }}/..
190+
arch: win64_msvc2022_64
193191
- name: Prepare Vulkan SDK
194192
uses: humbletim/setup-vulkan-sdk@v1.2.1
195193
with:

.github/workflows/build-test.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'test/*'
77

88
env:
9-
QT_VERSION: 6.9.1
9+
QT_VERSION: 6.9.2
1010

1111
jobs:
1212
build_linux:
@@ -123,15 +123,13 @@ jobs:
123123
# arch: win32_msvc2017
124124
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
125125
# aqtversion: ==0.8
126-
# - name: Install Qt (64 bit)
127-
# uses: jurplel/install-qt-action@v2
128-
# if: ${{ matrix.arch == 'x64' }}
129-
# with:
130-
# version: ${{ env.QT_VERSION }}
131-
# dir: ${{ github.workspace }}/..
132-
# arch: win64_msvc2017_64
133-
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
134-
# aqtversion: ==0.8
126+
- name: Install Qt (64 bit)
127+
uses: jurplel/install-qt-action@v4
128+
if: ${{ matrix.arch == 'x64' }}
129+
with:
130+
version: ${{ env.QT_VERSION }}
131+
dir: ${{ github.workspace }}/..
132+
arch: win64_msvc2022_64
135133
- name: Prepare Vulkan SDK
136134
uses: humbletim/setup-vulkan-sdk@v1.2.1
137135
with:

0 commit comments

Comments
 (0)