mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-22 14:26:00 +00:00
fix(lab): report a failed command as a failed build and update progress every five seconds
This commit is contained in:
1 parent
acecbcd79a
commit
0cf83ce71d
1 file changed
+5
-2
@@ -25,6 +25,7 @@ progress() { # stage [permille task done total eta]
|
|||||||
}
|
}
|
||||||
fail() { progress failed 0 "$*"; echo "dd-lab-build: $*" >&2; exit 1; }
|
fail() { progress failed 0 "$*"; echo "dd-lab-build: $*" >&2; exit 1; }
|
||||||
trap 'progress failed 0 stopped; exit 143' INT TERM
|
trap 'progress failed 0 stopped; exit 143' INT TERM
|
||||||
|
trap 'progress failed 0 "a command failed on line $LINENO"' ERR
|
||||||
device() { adb -s "$serial" shell "$@" | tr -d '\r'; }
|
device() { adb -s "$serial" shell "$@" | tr -d '\r'; }
|
||||||
|
|
||||||
progress checking
|
progress checking
|
||||||
@@ -101,9 +102,11 @@ report() {
|
|||||||
echo "$n $task $(( (now - started) / 60 )) $left"
|
echo "$n $task $(( (now - started) / 60 )) $left"
|
||||||
}
|
}
|
||||||
(
|
(
|
||||||
while sleep 20; do
|
beat=0
|
||||||
|
while sleep 5; do
|
||||||
set -- $(report)
|
set -- $(report)
|
||||||
echo "[build $1/$total] still on $2, $3m in, about $(( $4 / 60 + 1 ))m left"
|
beat=$(( beat + 1 ))
|
||||||
|
[ $(( beat % 12 )) = 0 ] && echo "[build $1/$total] still on $2, $3m in, about $(( $4 / 60 + 1 ))m left"
|
||||||
done
|
done
|
||||||
) &
|
) &
|
||||||
heartbeat=$!
|
heartbeat=$!
|
||||||
|
|||||||
Reference in new issue
Block a user