Skip to content

Commit 2948b24

Browse files
authored
Merge pull request #129 from scratchcpp/qt_6.7
Add Qt 6.7 support
2 parents 069b5d5 + dea97aa commit 2948b24

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

.github/workflows/build.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ env:
1111

1212
jobs:
1313
build:
14+
strategy:
15+
matrix:
16+
include:
17+
- qt_version: '6.6'
18+
qt_arch: 'gcc_64'
19+
- qt_version: '6.7'
20+
qt_arch: 'linux_gcc_64'
21+
1422
runs-on: ubuntu-latest
1523

1624
steps:
@@ -24,9 +32,10 @@ jobs:
2432
sudo apt-get install -y nlohmann-json3-dev libutfcpp-dev libgd-dev xvfb libxcb-cursor0
2533
shell: bash
2634
- name: Install Qt
27-
uses: jurplel/install-qt-action@v3
35+
uses: jurplel/install-qt-action@v4
2836
with:
29-
version: '6.6.*'
37+
version: '${{ matrix.qt_version }}'
38+
arch: '${{ matrix.qt_arch }}'
3039
- name: Configure CMake
3140
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
3241

.github/workflows/utests.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ env:
1111

1212
jobs:
1313
build:
14+
strategy:
15+
matrix:
16+
include:
17+
- qt_version: '6.6'
18+
qt_arch: 'gcc_64'
19+
- qt_version: '6.7'
20+
qt_arch: 'linux_gcc_64'
21+
1422
runs-on: ubuntu-latest
1523

1624
steps:
@@ -24,9 +32,10 @@ jobs:
2432
sudo apt-get install -y nlohmann-json3-dev libutfcpp-dev libgd-dev xvfb libxcb-cursor0
2533
shell: bash
2634
- name: Install Qt
27-
uses: jurplel/install-qt-action@v3
35+
uses: jurplel/install-qt-action@v4
2836
with:
29-
version: '6.6.*'
37+
version: '${{ matrix.qt_version }}'
38+
arch: '${{ matrix.qt_arch }}'
3039
- name: Configure CMake
3140
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSCRATCHCPPRENDER_BUILD_UNIT_TESTS=ON
3241

0 commit comments

Comments
 (0)