Skip to content

Commit dfefe99

Browse files
ogoffartogoffart
committed
CI: update Qt, defaults to Qt6 for the linux binaries
Closes #6586
1 parent d27c5dc commit dfefe99

File tree

3 files changed

+17
-22
lines changed

3 files changed

+17
-22
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020
jobs:
2121
build_and_test:
2222
env:
23-
DYLD_FRAMEWORK_PATH: /Users/runner/work/slint/Qt/5.15.2/clang_64/lib
23+
DYLD_FRAMEWORK_PATH: /Users/runner/work/slint/Qt/6.2.2/macos/lib
2424
QT_QPA_PLATFORM: offscreen
2525
RUSTFLAGS: -D warnings
2626
CARGO_PROFILE_DEV_DEBUG: 0
@@ -58,9 +58,9 @@ jobs:
5858
python-version: '3.10'
5959
- name: Install Qt
6060
if: runner.os != 'Windows'
61-
uses: jurplel/install-qt-action@v3
61+
uses: jurplel/install-qt-action@v4
6262
with:
63-
version: "5.15.2"
63+
version: "6.2.2"
6464
setup-python: false
6565
cache: true
6666
- name: Install ffmpeg and alsa (Linux)
@@ -77,7 +77,7 @@ jobs:
7777
- uses: ./.github/actions/setup-rust
7878
with:
7979
toolchain: ${{ matrix.rust_version }}
80-
key: x-v2
80+
key: x-v3
8181
# - name: Pin dependencies to make it build with our MSRV
8282
# if: matrix.rust_version == '1.77'
8383
# shell: bash
@@ -86,12 +86,12 @@ jobs:
8686
# cargo update -p xxx --precise x.y.z
8787
# fi
8888
- name: Run tests (not qt)
89-
run: DYLD_FRAMEWORK_PATH=$Qt5_DIR/lib cargo test --verbose --all-features --workspace ${{ matrix.extra_args }} --exclude slint-node --exclude pyslint --exclude test-driver-node --exclude slint-node --exclude test-driver-nodejs --exclude test-driver-cpp --exclude mcu-board-support --exclude printerdemo_mcu --exclude uefi-demo --exclude slint-cpp --exclude slint-python -- --skip=_qt::t
89+
run: cargo test --verbose --all-features --workspace ${{ matrix.extra_args }} --exclude slint-node --exclude pyslint --exclude test-driver-node --exclude slint-node --exclude test-driver-nodejs --exclude test-driver-cpp --exclude mcu-board-support --exclude printerdemo_mcu --exclude uefi-demo --exclude slint-cpp --exclude slint-python -- --skip=_qt::t
9090
env:
9191
SLINT_CREATE_SCREENSHOTS: 1
9292
shell: bash
9393
- name: Run tests (qt)
94-
run: DYLD_FRAMEWORK_PATH=$Qt5_DIR/lib cargo test --verbose --all-features --workspace ${{ matrix.extra_args }} --exclude slint-node --exclude pyslint --exclude test-driver-node --exclude slint-node --exclude test-driver-nodejs --exclude test-driver-cpp --exclude mcu-board-support --exclude printerdemo_mcu --exclude uefi-demo --exclude slint-cpp --exclude slint-python --bin test-driver-rust -- _qt --test-threads=1
94+
run: cargo test --verbose --all-features --workspace ${{ matrix.extra_args }} --exclude slint-node --exclude pyslint --exclude test-driver-node --exclude slint-node --exclude test-driver-nodejs --exclude test-driver-cpp --exclude mcu-board-support --exclude printerdemo_mcu --exclude uefi-demo --exclude slint-cpp --exclude slint-python --bin test-driver-rust -- _qt --test-threads=1
9595
shell: bash
9696
- name: Archive screenshots after failed tests
9797
if: ${{ failure() }}
@@ -120,7 +120,7 @@ jobs:
120120
- uses: ./.github/actions/install-linux-dependencies
121121
- name: Install Qt
122122
if: runner.os != 'Windows'
123-
uses: jurplel/install-qt-action@v3
123+
uses: jurplel/install-qt-action@v4
124124
with:
125125
version: "5.15.2"
126126
setup-python: false
@@ -173,7 +173,7 @@ jobs:
173173
- uses: ./.github/actions/install-linux-dependencies
174174
- name: Install Qt
175175
if: runner.os == 'Linux'
176-
uses: jurplel/install-qt-action@v3
176+
uses: jurplel/install-qt-action@v4
177177
with:
178178
version: "5.15.2"
179179
setup-python: false
@@ -211,7 +211,7 @@ jobs:
211211
force-gcc-10: true
212212
- name: Install Qt
213213
if: runner.os != 'Windows'
214-
uses: jurplel/install-qt-action@v3
214+
uses: jurplel/install-qt-action@v4
215215
with:
216216
version: "5.15.2"
217217
cache: true
@@ -251,7 +251,7 @@ jobs:
251251
with:
252252
force-gcc-10: true
253253
- name: Install Qt
254-
uses: jurplel/install-qt-action@v3
254+
uses: jurplel/install-qt-action@v4
255255
with:
256256
version: 6.5.1
257257
cache: true
@@ -299,7 +299,7 @@ jobs:
299299
with:
300300
force-gcc-10: true
301301
- name: Install Qt (Ubuntu)
302-
uses: jurplel/install-qt-action@v3
302+
uses: jurplel/install-qt-action@v4
303303
with:
304304
version: 6.5.1
305305
cache: true

‎.github/workflows/cpp_package.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env:
2323
jobs:
2424
cmake_package_desktop:
2525
env:
26-
DYLD_FRAMEWORK_PATH: /Users/runner/work/slint/Qt/6.5.1/clang_64/lib
26+
DYLD_FRAMEWORK_PATH: /Users/runner/work/slint/Qt/6.2.2/clang_64/lib
2727
QT_QPA_PLATFORM: offscreen
2828
CARGO_INCREMENTAL: false
2929
strategy:
@@ -46,10 +46,10 @@ jobs:
4646
with:
4747
old-ubuntu: true
4848
- name: Install Qt (Ubuntu)
49-
uses: jurplel/install-qt-action@v3
49+
uses: jurplel/install-qt-action@v4
5050
if: matrix.os == 'ubuntu-20.04'
5151
with:
52-
version: 5.15.2
52+
version: 6.2.2
5353
cache: true
5454
- uses: ./.github/actions/setup-rust
5555
- uses: baptiste0928/cargo-install@v3

‎.github/workflows/slint_tool_binary.yaml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@ jobs:
6161
- uses: ./.github/actions/setup-rust
6262
with:
6363
target: x86_64-pc-windows-msvc
64-
- name: Install Qt
65-
uses: jurplel/install-qt-action@v3
66-
with:
67-
version: 6.5.1
68-
cache: true
6964
- uses: baptiste0928/cargo-install@v3
7065
with:
7166
crate: cargo-about
@@ -101,9 +96,9 @@ jobs:
10196
with:
10297
target: x86_64-unknown-linux-gnu
10398
- name: Install Qt
104-
uses: jurplel/install-qt-action@v3
99+
uses: jurplel/install-qt-action@v4
105100
with:
106-
version: 5.15.2
101+
version: 6.2.2
107102
cache: true
108103
- uses: baptiste0928/cargo-install@v3
109104
with:
@@ -143,7 +138,7 @@ jobs:
143138
with:
144139
crate: cargo-about
145140
- name: Build
146-
run: cross build --target=${{ matrix.target }} --no-default-features --features backend-qt,${{ github.event.inputs.features || inputs.features }} --release -p slint-${{ github.event.inputs.program || inputs.program }}
141+
run: cross build --target=${{ matrix.target }} --no-default-features --features ${{ github.event.inputs.features || inputs.features }} --release -p slint-${{ github.event.inputs.program || inputs.program }}
147142
- name: Create artifact directory
148143
run: |
149144
mkdir -p slint-${{ github.event.inputs.program || inputs.program }}-${{ matrix.target }}

0 commit comments

Comments
 (0)