mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #114573 - Kobzol:ci-no-group-on-error, r=oli-obk

Browse Source 
CI: do not hide error logs in a group

This PR avoids creating a GHA group at the very end of a CI workflow when some failure has happened. Before, when a failure has happened, its GHA group was not closed, however the clock drift check function would create a new group, which would actually close the group containing the error log, thus making errors hidden by default, which is not ideal.

See discussion here: https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/GHA.20groups.20being.20closed.20on.20failures

r? bootstrap
This commit is contained in:
Matthias Krüger 2023-08-07 16:47:58 +02:00 committed by GitHub
commit d9f3d49c81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ci/run.sh
View File

@ -154,13 +154,25 @@ fi
# check for clock drifts. An HTTP URL is used instead of HTTPS since on Azure # check for clock drifts. An HTTP URL is used instead of HTTPS since on Azure
# Pipelines it happened that the certificates were marked as expired. # Pipelines it happened that the certificates were marked as expired.
datecheck() { datecheck() {
# If an error has happened, we do not want to start a new group, because that will collapse
# a previous group that might have contained the error log.
exit_code=$?
if [ $exit_code -eq 0 ]
then
echo "::group::Clock drift check" echo "::group::Clock drift check"
fi
echo -n " local time: " echo -n " local time: "
date date
echo -n " network time: " echo -n " network time: "
curl -fs --head http://ci-caches.rust-lang.org | grep ^Date: \ curl -fs --head http://ci-caches.rust-lang.org | grep ^Date: \
| sed 's/Date: //g' || true | sed 's/Date: //g' || true
if [ $exit_code -eq 0 ]
then
echo "::endgroup::" echo "::endgroup::"
fi
} }
datecheck datecheck
trap datecheck EXIT trap datecheck EXIT