qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ci: switch back to printing output to stderr

Browse Source
This commit is contained in:
Aaron Bieber 2024-05-20 06:56:47 -06:00
parent 6893c30c60
commit ac6b7a8b7b
No known key found for this signature in database
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/ci
View File

@ -64,8 +64,8 @@ if [ "${1}" = "update" ]; then
maybe_new_hash="$(git rev-parse HEAD)"
if [ "${current_hash}" != "${maybe_new_hash}" ]; then
if ! nix flake check --print-build-logs 2>/tmp/ci-flake-check-${inp}; then
handle_update_check_fail "$inp" /tmp/ci-flake-check-${inp}
if ! nix flake check --print-build-logs; then
handle_update_check_fail "$inp"
continue
fi
else
@ -83,8 +83,8 @@ if [ "${1}" = "update" ]; then
fi
done
if ! nix flake check --print-build-logs 2>/tmp/ci-flake-check; then
handle_update_check_fail "$ci_branch" /tmp/ci-flake-check
if ! nix flake check --print-build-logs; then
handle_update_check_fail "$ci_branch"
exit 1
fi
@ -106,8 +106,8 @@ if [ "${1}" = "update" ]; then
exit 1
fi
else
if ! nix flake check --print-build-logs 2>/tmp/ci-flake-check; then
handle_check_fail /tmp/ci-flake-check
if ! nix flake check --print-build-logs; then
handle_check_fail
exit 1
fi
fi

2
common.sh
View File

@ -138,7 +138,7 @@ handle_update_fail() {
}
handle_check_fail() {
po_error "CI: checks failed!" "$(tail -n 30 $1)"
po_error "CI: checks failed!" "$(get_journal xin-ci)"
}
handle_update_check_fail() {