Skip to content

Commit 3f5c9ea

Browse files
committed
Update the collation job for the new test artifact names
1 parent 0f613af commit 3f5c9ea

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -812,14 +812,14 @@ jobs:
812812
# Update source code paths from macOS tracefiles to match Linux.
813813
sed -i -Ee 's|^SF:/Users|SF:/home|' artifacts/*.macos-*/**/coverage.info
814814
# Update source code paths from Windows tracefiles to match Linux, and remove all \r chars from line endings.
815-
sed -i -Ee 's|\r$||' -e 's|\\|/|g' -e 's|^SF:D:/a|SF:/home/runner/work|' artifacts/*.win.*/**/coverage.info
815+
sed -i -Ee 's|\r$||' -e 's|\\|/|g' -e 's|^SF:D:/a|SF:/home/runner/work|' artifacts/*.win*/**/coverage.info
816816
# Combine all tracefiles into one. Note, ignoring inconsistencies between Clang and GCC reports :|
817817
lcov --ignore-errors inconsistent $(find artifacts -name '*.info' -type f -printf '-a %p\n') -o coverage.info
818818
# Generate the HTML report. Note, ignoring inconsistencies between Clang and GCC reports :|
819819
genhtml --demangle-cpp --ignore-errors inconsistent --no-sort --output-directory coverage coverage.info
820820
# Can use any of the removeHtmlDates.sh scripts here, so the Ubuntu x86-64 GCC Qt6 job's version will do.
821-
/usr/bin/env bash ./artifacts/test-results-*.x86-64.gcc.qt-6/coverage/removeHtmlDates.sh coverage
822-
# Remove build numbers from pre-releases, and remove extra build info (such as ".linux.x86-64.gcc.qt-6")
821+
/usr/bin/env bash ./artifacts/test-results-*.linux.24.04.x86-64.gcc.qt-6/coverage/removeHtmlDates.sh coverage
822+
# Remove build numbers from pre-releases, and remove extra build info (such as ".linux.24.04.x86-64.gcc.qt-6")
823823
# from all releases, since this coverage report is an aggregation of many build hosts.
824824
sed -i -Ee 's/(headerValue">([0-9]+\.){2}[0-9]+)(((-pre)\+[0-9]+)|(\+[0-9]+))\..*</\1\5\6</' \
825825
coverage/**/*.html

0 commit comments

Comments
 (0)