From e178bd5bf5634d1d3b5fca20c8d59029076b6146 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Fri, 24 Jan 2025 08:17:20 +0100 Subject: [PATCH] remove drone compatibility from the appimage build script Signed-off-by: Jyrki Gadinger --- admin/linux/build-appimage.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/admin/linux/build-appimage.sh b/admin/linux/build-appimage.sh index 61b1b6f67e3e0..d2951224c50ed 100755 --- a/admin/linux/build-appimage.sh +++ b/admin/linux/build-appimage.sh @@ -12,7 +12,7 @@ export OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR:-/usr/lib/x86_64-linux-gnu} export VERSION_SUFFIX=${VERSION_SUFFIX:stable} # Set defaults -export SUFFIX=${PR_ID:=${DRONE_PULL_REQUEST:=master}} +export SUFFIX=${PR_ID:=master} if [ $SUFFIX != "master" ]; then SUFFIX="PR-$SUFFIX" fi @@ -111,10 +111,9 @@ rm ./squashfs-root/usr/lib/libglib-2.0.so.0 LD_LIBRARY_PATH="$PWD/appimagetool-squashfs-root/usr/lib":$LD_LIBRARY_PATH PATH="$PWD/appimagetool-squashfs-root/usr/bin":$PATH appimagetool -n ./squashfs-root "${APPIMAGE}" #move AppImage -export COMMIT=${GITHUB_SHA:=${DRONE_COMMIT}} -if [ ! -z "$COMMIT" ] +if [ ! -z "$GITHUB_SHA" ] then - export APPIMAGE_NAME="${EXECUTABLE_NAME}-${SUFFIX}-${COMMIT}-x86_64.AppImage" + export APPIMAGE_NAME="${EXECUTABLE_NAME}-${SUFFIX}-${GITHUB_SHA}-x86_64.AppImage" else export APPIMAGE_NAME="${EXECUTABLE_NAME}-${SUFFIX}-x86_64.AppImage" fi