Skip to content

Commit 75b8ce3

Browse files
igorkorsukovigorkorsukov
committed
Switch to Qt 6.9.1 on CI by default
1 parent cdf485d commit 75b8ce3

13 files changed

+75
-44
lines changed

‎.github/workflows/build_all.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
required: false
2727
use_qt69:
2828
description: 'Use Qt 6.9'
29-
default: 'off'
29+
default: 'on'
3030
required: false
3131
workflow_call:
3232
inputs:
@@ -57,7 +57,7 @@ on:
5757
required: false
5858
use_qt69:
5959
description: 'Use Qt 6.9'
60-
default: 'off'
60+
default: 'on'
6161
type: string
6262
required: false
6363

‎.github/workflows/build_backend.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
required: false
2121
use_qt69:
2222
description: 'Use Qt 6.9'
23-
default: 'off'
23+
default: 'on'
2424
required: false
2525
workflow_call:
2626
inputs:
@@ -41,10 +41,13 @@ on:
4141
required: false
4242
use_qt69:
4343
description: 'Use Qt 6.9'
44-
default: 'off'
44+
default: 'on'
4545
type: string
4646
required: false
4747

48+
env:
49+
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}
50+
4851
jobs:
4952
backend:
5053
runs-on: ubuntu-22.04
@@ -101,10 +104,10 @@ jobs:
101104
- name: Install Qt
102105
uses: jurplel/install-qt-action@v4
103106
with:
104-
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
107+
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
105108
host: 'linux'
106109
target: 'desktop'
107-
arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
110+
arch: ${{ env.USE_QT69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
108111
modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
109112

110113
- name: Setup environment

‎.github/workflows/build_linux.yml‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
required: false
2323
use_qt69:
2424
description: 'Use Qt 6.9'
25-
default: 'off'
25+
default: 'on'
2626
required: false
2727
workflow_call:
2828
inputs:
@@ -48,12 +48,25 @@ on:
4848
required: false
4949
use_qt69:
5050
description: 'Use Qt 6.9'
51-
default: 'off'
51+
default: 'on'
5252
type: string
53-
required: false
53+
required: false
54+
55+
env:
56+
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}
5457

5558
jobs:
59+
setup:
60+
runs-on: ubuntu-22.04
61+
outputs:
62+
use_qt69: ${{ steps.set_use_qt69.outputs.use_qt69 }}
63+
steps:
64+
- id: set_use_qt69
65+
run: |
66+
echo "use_qt69=${{ env.USE_QT69 }}" >> $GITHUB_OUTPUT
67+
5668
build:
69+
needs: setup
5770
if: github.event_name != 'workflow_dispatch' || contains(inputs.platforms, 'linux_x64') || contains(inputs.platforms, 'linux_arm64')
5871
runs-on: ${{ matrix.runs-on }}
5972
strategy:
@@ -72,11 +85,12 @@ jobs:
7285
arch: x86_64
7386
runs-on: ubuntu-22.04
7487
qt-host: linux
75-
qt-arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
88+
qt-version: ${{ needs.setup.outputs.use_qt69 == 'on' && '6.9.1' || '6.2.4' }}
89+
qt-arch: ${{ needs.setup.outputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
7690
dump-symbols-arch: x86-64
7791
- platform: linux_arm64
7892
arch: aarch64
79-
runs-on: ${{ inputs.use_qt69 == 'on' && 'ubuntu-24.04-arm' || 'ubuntu-22.04-arm' }}
93+
runs-on: ${{ needs.setup.outputs.use_qt69 == 'on' && 'ubuntu-24.04-arm' || 'ubuntu-22.04-arm' }}
8094
qt-host: linux_arm64
8195
qt-arch: linux_gcc_arm64
8296
dump-symbols-arch: aarch64
@@ -181,15 +195,15 @@ jobs:
181195

182196
- name: Install Qt
183197
uses: jurplel/install-qt-action@v4
184-
if: ${{ !(matrix.qt-host == 'linux_arm64' && inputs.use_qt69 != 'on') }}
198+
if: ${{ !(matrix.qt-host == 'linux_arm64' && env.USE_QT69 != 'on') }}
185199
with:
186-
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
200+
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
187201
host: ${{ matrix.qt-host }}
188202
target: 'desktop'
189203
arch: ${{ matrix.qt-arch }}
190204
modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
191205
- name: Install Qt 6.2.4 arm64
192-
if: ${{ matrix.qt-host == 'linux_arm64' && inputs.use_qt69 != 'on' }}
206+
if: ${{ matrix.qt-host == 'linux_arm64' && env.USE_QT69 != 'on' }}
193207
run: |
194208
bash ./buildscripts/ci/linux/arm64/install_qt.sh
195209
- name: Setup environment

‎.github/workflows/build_linux_arm32.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: 'Build: Linux arm32'
22

33
on:
4-
# pull_request:
4+
#pull_request:
55
workflow_dispatch:
66
inputs:
77
build_mode:
@@ -18,7 +18,7 @@ on:
1818
required: false
1919
use_qt69:
2020
description: 'Use Qt 6.9'
21-
default: 'off'
21+
default: 'on'
2222
required: false
2323
workflow_call:
2424
inputs:
@@ -39,9 +39,9 @@ on:
3939
required: false
4040
use_qt69:
4141
description: 'Use Qt 6.9'
42-
default: 'off'
42+
default: 'on'
4343
type: string
44-
required: false
44+
required: false
4545

4646
jobs:
4747
linux_arm32:

‎.github/workflows/build_macos.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
required: false
1919
use_qt69:
2020
description: 'Use Qt 6.9'
21-
default: 'off'
21+
default: 'on'
2222
required: false
2323
workflow_call:
2424
inputs:
@@ -39,12 +39,13 @@ on:
3939
required: false
4040
use_qt69:
4141
description: 'Use Qt 6.9'
42-
default: 'off'
42+
default: 'on'
4343
type: string
4444
required: false
4545

4646
env:
4747
DEVELOPER_DIR: /Applications/Xcode_16.3.app/Contents/Developer
48+
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}
4849

4950
jobs:
5051
macos_universal:
@@ -163,7 +164,7 @@ jobs:
163164
- name: Install Qt
164165
uses: jurplel/install-qt-action@v4
165166
with:
166-
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
167+
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
167168
host: 'mac'
168169
target: 'desktop'
169170
arch: 'clang_64'

‎.github/workflows/build_nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ jobs:
4949
build_mode: 'nightly',
5050
publish: 'on',
5151
sentry_project: 'sandbox',
52-
use_qt69: 'off'
52+
use_qt69: 'on'
5353
}
5454
})

‎.github/workflows/build_windows.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
required: false
2323
use_qt69:
2424
description: 'Use Qt 6.9'
25-
default: 'off'
25+
default: 'on'
2626
required: false
2727
workflow_call:
2828
inputs:
@@ -48,10 +48,13 @@ on:
4848
required: false
4949
use_qt69:
5050
description: 'Use Qt 6.9'
51-
default: 'off'
51+
default: 'on'
5252
type: string
5353
required: false
5454

55+
env:
56+
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}
57+
5558
jobs:
5659
windows_x64:
5760
if: github.event_name != 'workflow_dispatch' || contains(inputs.platforms, 'windows_x64')
@@ -158,15 +161,15 @@ jobs:
158161

159162
- name: Install Qt
160163
uses: jurplel/install-qt-action@v4
161-
if: ${{ inputs.use_qt69 == 'on' }}
164+
if: ${{ env.USE_QT69 == 'on' }}
162165
with:
163-
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
166+
version: '6.9.1'
164167
host: 'windows'
165168
target: 'desktop'
166-
arch: ${{ inputs.use_qt69 == 'on' && 'win64_msvc2022_64' || 'win64_msvc2019_64' }}
169+
arch: 'win64_msvc2022_64'
167170
modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
168171
- name: Install Qt 6.2.11
169-
if: ${{ inputs.use_qt69 != 'on' }}
172+
if: ${{ env.USE_QT69 != 'on' }}
170173
run: |
171174
buildscripts\ci\windows\install_qt_6_2_11.bat
172175
- name: Setup environment
@@ -309,7 +312,7 @@ jobs:
309312
- name: Install Qt
310313
uses: jurplel/install-qt-action@v4
311314
with:
312-
version: '6.9.*'
315+
version: '6.9.1'
313316
host: 'windows'
314317
target: 'desktop'
315318
arch: 'win64_msvc2022_64'

‎.github/workflows/build_without_qt.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: 'Build: Without Qt'
22

33
on:
4-
pull_request:
4+
#pull_request:
55
workflow_dispatch:
66

77
jobs:

‎.github/workflows/check_unit_tests.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ on:
1010
default: 'false'
1111
use_qt69:
1212
description: 'Use Qt 6.9'
13-
default: 'off'
13+
default: 'on'
1414
required: false
1515
schedule:
1616
- cron: "0 3 * * 4" # Every Thursday night at 03:00 for master branch
1717

18+
env:
19+
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}
20+
1821
jobs:
1922
run_tests:
2023
runs-on: ubuntu-22.04
@@ -53,10 +56,10 @@ jobs:
5356
- name: Install Qt
5457
uses: jurplel/install-qt-action@v4
5558
with:
56-
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
59+
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
5760
host: 'linux'
5861
target: 'desktop'
59-
arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
62+
arch: ${{ env.USE_QT69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
6063
modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
6164
- name: Setup environment
6265
run: |

‎.github/workflows/check_visual_tests.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ on:
66
inputs:
77
use_qt69:
88
description: 'Use Qt 6.9'
9-
default: 'off'
9+
default: 'on'
1010
required: false
11+
12+
env:
13+
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}
14+
1115
jobs:
1216
setup:
1317
name: "Setup VTests workflow"
@@ -87,10 +91,10 @@ jobs:
8791
- name: Install Qt
8892
uses: jurplel/install-qt-action@v4
8993
with:
90-
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
94+
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
9195
host: 'linux'
9296
target: 'desktop'
93-
arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
97+
arch: ${{ env.USE_QT69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
9498
modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
9599
- name: Setup environment
96100
run: |
@@ -134,10 +138,10 @@ jobs:
134138
- name: Install Qt
135139
uses: jurplel/install-qt-action@v4
136140
with:
137-
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
141+
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
138142
host: 'linux'
139143
target: 'desktop'
140-
arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
144+
arch: ${{ env.USE_QT69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
141145
modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
142146
- name: Setup environment
143147
run: |

0 commit comments

Comments
 (0)