Skip to content

Commit 52944d0

Browse files
committed
CI update
Move mac from Qt5 to Qt6
1 parent d97f8ab commit 52944d0

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

.github/workflows/rust.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,9 @@ jobs:
1919
os: [ubuntu-latest, windows-latest]
2020
qt: [5.15.2, 5.9.9, 5.12.9]
2121
rust: [stable, nightly]
22-
include:
23-
- os: macos-latest
24-
rust: stable
25-
qt: 5.15.2
2622
runs-on: ${{ matrix.os }}
2723
steps:
28-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2925
- uses: dtolnay/rust-toolchain@stable
3026
with:
3127
toolchain: ${{ matrix.rust }}
@@ -34,7 +30,7 @@ jobs:
3430
key: rust_cache
3531

3632
- name: Install Qt
37-
uses: jurplel/install-qt-action@v3
33+
uses: jurplel/install-qt-action@v4
3834
with:
3935
version: ${{ matrix.qt }}
4036
cache: true
@@ -44,26 +40,26 @@ jobs:
4440
- name: Run tests
4541
run: DYLD_FRAMEWORK_PATH=$Qt5_DIR/lib cargo test --all-features
4642
shell: bash
47-
43+
4844

4945
# Qt6 is in a different job right now because it does not have many modules and most example don't compile
5046
qt6:
5147
strategy:
5248
matrix:
53-
os: [ubuntu-latest, windows-latest]
49+
os: [ubuntu-latest, windows-latest, macos-latest]
5450
ver: [6.2.0, 6.5.0]
5551
env:
5652
QT_QPA_PLATFORM: offscreen
5753
runs-on: ${{ matrix.os }}
5854
steps:
59-
- uses: actions/checkout@v3
55+
- uses: actions/checkout@v4
6056
- uses: dtolnay/rust-toolchain@stable
6157
- uses: Swatinem/rust-cache@v2
6258
with:
6359
key: rust_cache6
6460

6561
- name: Install Qt
66-
uses: jurplel/install-qt-action@v3
62+
uses: jurplel/install-qt-action@v4
6763
with:
6864
version: ${{ matrix.ver }}
6965
cache: true
@@ -80,7 +76,7 @@ jobs:
8076
os: [ubuntu-latest, windows-latest]
8177
runs-on: ${{ matrix.os }}
8278
steps:
83-
- uses: actions/checkout@v3
79+
- uses: actions/checkout@v4
8480
- uses: dtolnay/rust-toolchain@stable
8581
- uses: Swatinem/rust-cache@v2
8682
with:

0 commit comments

Comments
 (0)