From f4fe58edd7c7a8378359065c446f8eefe780c067 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Mon, 17 Jul 2023 16:08:24 +0200 Subject: [PATCH] CI Linux: prevent mkappimage auto upload mkappimage now tries to automatically upload the asset if it detects running in GitHub CI, which is not the one that we perhaps want. See following failed run: https://github.com/CESNET/UltraGrid/actions/runs/5575039257/jobs/10185765784 --- data/scripts/Linux-AppImage/create-appimage.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/data/scripts/Linux-AppImage/create-appimage.sh b/data/scripts/Linux-AppImage/create-appimage.sh index d9320b564b..f54ccfa5e7 100755 --- a/data/scripts/Linux-AppImage/create-appimage.sh +++ b/data/scripts/Linux-AppImage/create-appimage.sh @@ -81,7 +81,7 @@ fi add_fonts -if command wget >/dev/null && wget -V | grep -q https; then +if command -v wget >/dev/null && wget -V | grep -q https; then dl() { wget -O - ${GITHUB_TOKEN+--header "Authorization: token $GITHUB_TOKEN"} "$1" } @@ -167,8 +167,9 @@ UPDATE_INFORMATION= if [ $# -ge 1 ]; then UPDATE_INFORMATION="-u zsync|$1" fi -# shellcheck disable=SC2086 # word spliting of $UPDATE_INFORMATION is requested behavior -$mkappimage $UPDATE_INFORMATION $APPDIR +# shellcheck disable=SC1007,SC2086 # word spliting of +# $UPDATE_INFORMATION is a requested behavior +GITHUB_TOKEN= $mkappimage $UPDATE_INFORMATION $APPDIR rm -rf $APPDIR tmpinstall )