Skip to content

Commit 918310f

Browse files
committed
build: refine test
1 parent 3d06444 commit 918310f

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

.github/workflows/development.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
'${{ github.repository_owner }}' \
7878
'localhost:5000'
7979
80-
docker pull "${SOURCE_IMAGE}" || true
80+
docker pull -q "${SOURCE_IMAGE}" || true
8181
echo "IMAGE_HOME=$(mktemp -d)" >> "$GITHUB_OUTPUT"
8282
8383
echo ALPINE_VERSION="${ALPINE_VERSION}"| tee -a "$GITHUB_OUTPUT"
@@ -88,7 +88,6 @@ jobs:
8888
echo IMAGE_TAG_SAFE="$(echo "$IMAGE_TAG" | base64 -w 0 )"| tee -a "$GITHUB_OUTPUT"
8989
echo IMAGE_BUILDROOT_TAG_SAFE="$(echo "${IMAGE_TAG}-buildroot" | base64 -w 0 )"| tee -a "$GITHUB_OUTPUT"
9090
echo 'EXAMPLE_IMAGE_TAG='"${IMAGE_TAG}-example1" | tee -a "$GITHUB_OUTPUT"
91-
9291
echo REPOSITORY="${REPOSITORY}"| tee -a "$GITHUB_OUTPUT"
9392
echo REPOSITORY_SAFE="$(echo "${REPOSITORY}" | base64 -w 0 )"| tee -a "$GITHUB_OUTPUT"
9493
echo BASE_IMAGE_DIGEST="$(digest_of "$SOURCE_IMAGE")"| tee -a "$GITHUB_OUTPUT"
@@ -192,27 +191,29 @@ jobs:
192191
test_command: curl -sLv 'http://localhost:8080/'
193192
run: |
194193
set -o pipefail
194+
195+
run_test () {
196+
local rv=0
197+
local T="$(mktemp)"
198+
trap 'rm -f '"$T" RETURN
199+
>"$T" 2>&1 eval "$@" || rv=$?
200+
printf '`%s` (returned code: ' "$@"
201+
printf '%s)\n```\n' "$rv"
202+
cat "$T"
203+
printf '\n```\n\n'
204+
return "$rv"
205+
}
206+
195207
rc=0
196-
container_id="$(docker run --pull never --detach -p 8080:8080 --rm $IMAGE_URI)" || rc=$?
208+
container_id="$(docker run --detach -p 8080:8080 --rm $IMAGE_URI)" || rc=$?
197209
if [ $rc -ne 0 ]; then
198210
printf 'docker run failed (return code '$rc')!\n' | >&2 tee \
199211
-a "$GITHUB_OUTPUT"
200212
exit $rc
201213
fi
202214
trap 'docker stop $container_id' EXIT
203-
start_ts=$(date +%s)
204-
run_test () {
205-
local rc=0
206-
local T="$(mktemp)"
207-
trap 'rm -f '"$T" RETURN
208-
>"$T" 2>&1 eval $test_command || rc=$?
209-
printf '`%s` (returned code: ' "$test_command"
210-
printf '%s)\n```\n' "$rc"
211-
cat "$T"
212-
printf '\n```\n\n'
213-
return "$rc"
214-
}
215215
216+
start_ts=$(date +%s)
216217
until [ x$(curl \
217218
--silent --output /dev/null \
218219
-w '%{http_code}\n' --fail 'http://localhost:8080/') = x200 ]
@@ -224,7 +225,7 @@ jobs:
224225
fi
225226
done
226227
rc=0
227-
(run_test | tee -a "$GITHUB_STEP_SUMMARY) || rc=$?
228+
(run_test "$test_command" | tee -a "$GITHUB_STEP_SUMMARY) || rc=$?
228229
if [ $rc -ne 0 ]; then
229230
exit $rc
230231
fi

0 commit comments

Comments
 (0)