From ee679637164df179fccbe6fe4bc6b37ed4509112 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 28 Nov 2023 13:12:05 +0800 Subject: [PATCH] CI: Fix CI_HELPER Commit 18d3c529fa4ab8dafcf6c147cf3cb55792d8ca10 caused CI_HELPER to be set to "''" (two single quotes), leading to an error when test.sh tries to source $CI_HELPER. CI_HELPER is not set anywhere else and not passed into the container environment, so there is no need to test if it has a value. This fixes the value of CI_HELPER. Fixes: 18d3c529fa4a ("github-ci: error on any shell errors") Signed-off-by: Jeffery To (cherry picked from commit 562f5df67fd9436dface35a410e9ce591d9a2894) --- .github/workflows/entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/entrypoint.sh b/.github/workflows/entrypoint.sh index 8d48d8a22e..363e158226 100755 --- a/.github/workflows/entrypoint.sh +++ b/.github/workflows/entrypoint.sh @@ -13,7 +13,7 @@ mkdir -p /var/lock/ opkg update -[ -n "${CI_HELPER:=''}" ] || CI_HELPER="/ci/.github/workflows/ci_helpers.sh" +export CI_HELPER="/ci/.github/workflows/ci_helpers.sh" for PKG in /ci/*.ipk; do tar -xzOf "$PKG" ./control.tar.gz | tar xzf - ./control @@ -42,7 +42,7 @@ for PKG in /ci/*.ipk; do continue fi - export PKG_NAME PKG_VERSION CI_HELPER + export PKG_NAME PKG_VERSION if [ -f "$PRE_TEST_SCRIPT" ]; then echo "Use package specific pre-test.sh" -- 2.30.2