Skip to content

Commit 38aae48

Browse files
committed
Separate the coverage and non-coverage steps
Makes the Linux and macOS steps consistent with the Windows job.
1 parent 6a638eb commit 38aae48

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

.github/workflows/build.yaml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,14 @@ jobs:
128128
[[ '${{ matrix.os }}' == '22.04' && '${{ matrix.cc }}' == 'clang' ]] ||
129129
"$RUNNER_TEMP/coverage/src/cli/dokit" --version
130130
"$RUNNER_TEMP/release/src/cli/dokit" --version
131-
- name: Test
132-
run: |
133-
[[ '${{ matrix.os }}' == '22.04' && '${{ matrix.cc }}' == 'clang' ]] ||
134-
ctest --output-on-failure --test-dir "$RUNNER_TEMP/coverage" --verbose
135-
ctest --output-on-failure --test-dir "$RUNNER_TEMP/release" --verbose
136-
cmake --build "$RUNNER_TEMP/coverage" --target coverage
131+
- name: Test w/ coverage
132+
if: matrix.os != '22.04' || matrix.cc != 'clang'
133+
run: ctest --output-on-failure --test-dir "$RUNNER_TEMP/coverage" --verbose
134+
- name: Test w/o coverage
135+
run: ctest --output-on-failure --test-dir "$RUNNER_TEMP/release" --verbose
136+
- name: Collate test coverage
137+
if: matrix.os != '22.04' || matrix.cc != 'clang'
138+
run: cmake --build "$RUNNER_TEMP/coverage" --target coverage
137139
- name: Test localisations
138140
# \todo For unknown reasons, Qt 6.2.4 w/ GCC fails to include full set of *.qm file - happens locally too, not
139141
# just on GitHub hosted runners. We could diagnose further, but this one corner case is very low value today.
@@ -352,11 +354,12 @@ jobs:
352354
sudo sqlite3 "$HOME/Library/Application Support/com.apple.TCC/TCC.db" "INSERT or REPLACE INTO access
353355
( service, client, client_type, auth_value, auth_reason, auth_version, flags ) VALUES
354356
( 'kTCCServiceBluetoothAlways', '/usr/local/opt/runner/provisioner/provisioner', 1, 2, 3, 1, 0 )"
355-
- name: Test
356-
run: |
357-
[[ '${{ matrix.os }}' == 'macos-13' && '${{ matrix.cc }}' == 'clang' ]] ||
358-
ctest --output-on-failure --test-dir "$RUNNER_TEMP/coverage" --verbose
359-
ctest --output-on-failure --test-dir "$RUNNER_TEMP/release" --verbose
357+
- name: Test w/ coverage
358+
if: matrix.os != 'macos-13' || matrix.cc != 'clang'
359+
run: ctest --output-on-failure --test-dir "$RUNNER_TEMP/coverage" --verbose
360+
timeout-minutes: 1
361+
- name: Test w/o coverage
362+
run: ctest --output-on-failure --test-dir "$RUNNER_TEMP/release" --verbose
360363
timeout-minutes: 1
361364
- name: Test localisations
362365
if: startsWith(matrix.qt, '6')

0 commit comments

Comments
 (0)