From 7decdf0d9c9ec2057c7ca37ee746ef37c5c21c1c Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Sun, 10 May 2026 00:19:35 +0300 Subject: [PATCH 1/3] multi-arch-test-build: improve library path checking Don't check deeply-nested libraries that might be there only for internal use. Use library paths based on: strings /lib/ld-musl-*.so.1 | grep -E '(/lib|/usr/lib)' Signed-off-by: George Sapkin --- .github/scripts/test_entrypoint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/scripts/test_entrypoint.sh b/.github/scripts/test_entrypoint.sh index a82acb2..a4a4f87 100755 --- a/.github/scripts/test_entrypoint.sh +++ b/.github/scripts/test_entrypoint.sh @@ -26,8 +26,10 @@ is_in_exec_path() { echo "$1" | grep -qE '^(/bin/|/sbin/|/usr/bin/|/usr/sbin/|/usr/libexec/)' } +# Don't check deeply-nested libraries that might be there only for internal use +# Based on: strings /lib/ld-musl-*.so.1 | grep -E '(/lib|/usr/lib)' is_in_lib_path() { - echo "$1" | grep -qE '^(/lib/|/usr/lib/)' + echo "$1" | grep -qE '^(/lib|/usr/local/lib|/usr/lib)/[^/]+$' } is_apk() { From e43e59afbbd908ea8d13b5bfe357e97b2ad3877c Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Mon, 11 May 2026 15:39:32 +0200 Subject: [PATCH 2/3] multi-arch-test-build: clear package name for log output Clear package name for log output so as not to confused users with the final output. Signed-off-by: George Sapkin --- .github/scripts/test_entrypoint.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/scripts/test_entrypoint.sh b/.github/scripts/test_entrypoint.sh index a4a4f87..39bb821 100755 --- a/.github/scripts/test_entrypoint.sh +++ b/.github/scripts/test_entrypoint.sh @@ -361,6 +361,11 @@ for PKG in /ci/*.[ai]pk; do fi done +# Clear package name for log output so as not to confused users with the final +# output. +PKG_NAME= +export PKG_NAME + echo if [ "$RET" = 0 ]; then success 'All tests passed' From 4daeff3dd2988c37b81eb288e98235ba5b2b45b9 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Tue, 12 May 2026 15:15:29 +0300 Subject: [PATCH 3/3] multi-arch-test-build: show output when version check fails Show part of last command's output to help with debugging when a version check fails. Signed-off-by: George Sapkin --- .github/scripts/test_entrypoint.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/scripts/test_entrypoint.sh b/.github/scripts/test_entrypoint.sh index 39bb821..1b8f8ad 100755 --- a/.github/scripts/test_entrypoint.sh +++ b/.github/scripts/test_entrypoint.sh @@ -96,6 +96,15 @@ check_exec() { done status_warn "Version check ($file)" + + # Show part of last command's output to help with debugging + if [ -z "$output" ]; then + warn 'No output to show' + else + warn 'First 10 lines of the last output:' + echo "$output" | head -n 10 | sed 's/^/ /' + fi + return 2 }