From fff244e45aa94137bd0f8f3baf4f2f1334ad47bc Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Thu, 7 Jan 2021 20:35:27 +0100 Subject: [PATCH] ci: Avoid printing unnecessary empty lines --- .github/workflows/scripts/lib/testing.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scripts/lib/testing.sh b/.github/workflows/scripts/lib/testing.sh index a044bbc..913c9d4 100755 --- a/.github/workflows/scripts/lib/testing.sh +++ b/.github/workflows/scripts/lib/testing.sh @@ -7,7 +7,7 @@ function log { # Log an error. function err { - echo -e "\n[x] $1\n" + echo -e "\n[x] $1\n" >&2 } # Return the ID of the container running the given service. @@ -22,6 +22,7 @@ function container_id { fi local cid + # retry for max 60s (30*2s) for _ in $(seq 1 30); do cid="$(docker container ls -aq -f label="$label")" @@ -32,7 +33,6 @@ function container_id { echo -n '.' >&2 sleep 2 done - echo -e '\n' >&2 if [ -z "${cid:-}" ]; then err "Timed out waiting for creation of container with label ${label}" @@ -107,7 +107,6 @@ function poll_ready { echo -n 'x' >&2 sleep 5 done - echo -e '\n' >&2 echo -e "\n${output::-3}"