diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-05-11 17:09:56 +0300 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2023-05-11 17:09:56 +0300 |
| commit | ebd9464c98c101842ada9f8ea4e67ca33838bc58 (patch) | |
| tree | 1bc183ae30522ed3ada975682e0a6dfa1ac8e940 /.github | |
| parent | a1f4ffa99d3778c5ca70dfc1bfb453a69d769173 (diff) | |
| parent | 97c7f802ef065b6133fc075d1559ede4952bf872 (diff) | |
Merge branch '2.0' into master
Change-Id: I0322637bf5e81873da34f36e108611b163076e5f
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/main.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dacf54a9e..8e466d909 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -750,15 +750,15 @@ jobs: target: 'desktop', toolchain: 'win64_msvc2019_64', testProfile: 'MSVC2022-x64', - qtVersion: '5.15.2', + qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } - { - name: 'Run Windows tests (MSVC 2022, Qt 6.0.2)', + name: 'Run Windows tests (MSVC 2022, Qt 5.15)', target: 'desktop', toolchain: 'win64_msvc2019_64', testProfile: 'MSVC2022-x64', - qtVersion: '6.0.2', + qtVersion: '5.15.2', script: './scripts/test-qt.sh', } - { @@ -766,15 +766,15 @@ jobs: target: 'desktop', toolchain: 'win64_msvc2019_64', testProfile: 'clang-cl-x86_64', - qtVersion: '5.15.2', + qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } - { name: 'Run Windows tests (MinGW)', target: 'desktop', - toolchain: 'win64_mingw81', + toolchain: 'win64_mingw', testProfile: 'mingw-qt', - qtVersion: '5.15.2', + qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } env: |