Skip to content

Commit

Permalink
Rollup merge of rust-lang#114573 - Kobzol:ci-no-group-on-error, r=oli…
Browse files Browse the repository at this point in the history
…-obk

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
  • Loading branch information
matthiaskrgr committed Aug 7, 2023
2 parents e7b7362 + 8d33608 commit d9f3d49
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions src/ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,25 @@ fi
# 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.
datecheck() {
echo "::group::Clock drift check"
# 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"
fi

echo -n " local time: "
date
echo -n " network time: "
curl -fs --head http://ci-caches.rust-lang.org | grep ^Date: \
| sed 's/Date: //g' || true
echo "::endgroup::"

if [ $exit_code -eq 0 ]
then
echo "::endgroup::"
fi
}
datecheck
trap datecheck EXIT
Expand Down

0 comments on commit d9f3d49

Please sign in to comment.