ci: Call the report script on failure as well

GitLab's CI will bail out at the first failure, which means the
JSON-to-JUnit conversion script won't run unless it's part of the same
script that we run for building an testing.
This commit is contained in:
Emmanuele Bassi 2019-04-05 19:29:58 +01:00
parent ba07279c95
commit 220c516691
2 changed files with 14 additions and 1 deletions

View File

@ -17,7 +17,6 @@ fedora-x86_64:
stage: build
script:
- bash -x ./.gitlab-ci/test-docker.sh
- python3 ./.gitlab-ci/meson-junit-report.py --project-name=gtk --job-id="${CI_JOB_NAME}" --output=_build/report.xml _build/meson-logs/testlog.json
artifacts:
when: always
reports:

View File

@ -24,6 +24,8 @@ cd _build
ninja
ccache --show-stats
set +e
xvfb-run -a -s "-screen 0 1024x768x24" \
meson test \
--timeout-multiplier 2 \
@ -32,3 +34,15 @@ xvfb-run -a -s "-screen 0 1024x768x24" \
--no-suite=gtk:gsk \
--no-suite=gtk:reftest \
--no-suite=gtk:a11y
# Save the exit code
exit_code=$?
# We always want to run the report generator
$srcdir/.gitlab-ci/meson-junit-report.py \
--project-name=gtk \
--job-id="${CI_JOB_NAME}" \
--output=report.xml \
meson-logs/testlog.json
exit $exit_code