Skip to content

Commit d5aa170

Browse files
committed
Skip test collation in some specific cases
ie for Windows 2025, x86, MinGW, Qt 5.9 to 5.13.
1 parent e3df155 commit d5aa170

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

.github/workflows/build.yaml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -604,11 +604,16 @@ jobs:
604604
- { toolchain: 'llvm', arch: x86-64, qt: '6.9.1', aqtTools: 'tools_llvm_mingw1706' }
605605
- { toolchain: 'mingw', arch: x86-64, qt: '6.9.1', aqtTools: 'tools_mingw1310' }
606606
## Windows Server 2025-specific cases.
607-
- { toolchain: 'mingw', arch: x86, qt: '5.9.9', aqtTools: 'tools_mingw81,qt.tools.win32_mingw810' }
608-
- { toolchain: 'mingw', arch: x86, qt: '5.10.1', aqtTools: 'tools_mingw81,qt.tools.win32_mingw810' }
609-
- { toolchain: 'mingw', arch: x86, qt: '5.11.3', aqtTools: 'tools_mingw81,qt.tools.win32_mingw810' }
610-
- { toolchain: 'mingw', arch: x86, qt: '5.12.12', aqtTools: 'tools_mingw81,qt.tools.win32_mingw810' }
611-
- { toolchain: 'mingw', arch: x86, qt: '5.13.2', aqtTools: 'tools_mingw81,qt.tools.win32_mingw810' }
607+
- { os: '2025', toolchain: 'mingw', arch: x86, qt: '5.9.9',
608+
aqtTools: 'tools_mingw81,qt.tools.win32_mingw810' }
609+
- { os: '2025', toolchain: 'mingw', arch: x86, qt: '5.10.1',
610+
aqtTools: 'tools_mingw81,qt.tools.win32_mingw810' }
611+
- { os: '2025', toolchain: 'mingw', arch: x86, qt: '5.11.3',
612+
aqtTools: 'tools_mingw81,qt.tools.win32_mingw810' }
613+
- { os: '2025', toolchain: 'mingw', arch: x86, qt: '5.12.12',
614+
aqtTools: 'tools_mingw81,qt.tools.win32_mingw810' }
615+
- { os: '2025', toolchain: 'mingw', arch: x86, qt: '5.13.2',
616+
aqtTools: 'tools_mingw81,qt.tools.win32_mingw810' }
612617

613618
steps:
614619
- name: Configure path
@@ -729,8 +734,13 @@ jobs:
729734
- name: Test w/o coverage # We can't execute arm64 binaries on an x86-64 host.
730735
if: matrix.arch != 'arm64'
731736
run: ctest --output-on-failure --test-dir "%RUNNER_TEMP%/release" --verbose
732-
- name: Collate test coverage
733-
if: matrix.toolchain != 'msvc' && matrix.toolchain != 'llvm'
737+
- name: Collate test coverage # Currently available on MinGW builds only.
738+
# \todo The MinGW versions needed for building and testing on 32-bin binaries on Windows 2025 with Qt 5.9 to
739+
# 5.13, include a gcov binaries that can't be spawned by geninfo. We could probably work around this by somehow
740+
# overriding `gcov.exe` and/or `geninfo` binaries (to us the host's), but this is a low priority.
741+
if: >-
742+
matrix.toolchain == 'mingw' && !( matrix.os == '2025' && matrix.arch == 'x86' &&
743+
contains(fromJSON('["5.9.9", "5.10.1", "5.11.3", "5.12.12", "5.13.2"]'), matrix.qt) )
734744
run: cmake --build "%RUNNER_TEMP%/coverage" --target coverage --verbose
735745
- name: Upload test results
736746
if: matrix.arch != 'arm64' && ( matrix.toolchain != 'msvc' || fromJSON(steps.post-build.outputs.tap) )

0 commit comments

Comments
 (0)