From b484ba37263c2b70a22255ca6593e3b92de23f28 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Mon, 5 Sep 2022 22:52:40 +0200 Subject: [PATCH] fix script that upload AppImage to go in correct path Signed-off-by: Matthieu Gallien --- .drone.yml | 2 +- admin/linux/upload-appimage.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5902cfbab..60eadb59f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -106,7 +106,7 @@ steps: from_secret: CI_UPLOAD_GIT_USERNAME commands: - BUILDNR=$DRONE_BUILD_NUMBER VERSION_SUFFIX=$DRONE_PULL_REQUEST BUILD_UPDATER=ON DESKTOP_CLIENT_ROOT=$DRONE_WORKSPACE /bin/bash -c "./admin/linux/build-appimage.sh" - - /bin/bash -c "./admin/linux/upload-appimage.sh" || echo "Upload failed, however this is an optional step." + - DESKTOP_CLIENT_ROOT=$DRONE_WORKSPACE /bin/bash -c "./admin/linux/upload-appimage.sh" || echo "Upload failed, however this is an optional step." trigger: branch: - master diff --git a/admin/linux/upload-appimage.sh b/admin/linux/upload-appimage.sh index db36e8454..42f1f563f 100755 --- a/admin/linux/upload-appimage.sh +++ b/admin/linux/upload-appimage.sh @@ -5,6 +5,7 @@ export BUILD=${DRONE_BUILD_NUMBER} export PR=${DRONE_PULL_REQUEST} export GIT_USERNAME=${CI_UPLOAD_GIT_USERNAME} export GIT_TOKEN=${CI_UPLOAD_GIT_TOKEN} +export DESKTOP_CLIENT_ROOT=${DESKTOP_CLIENT_ROOT:-/home/user} # Defaults export GIT_REPO=ci-builds @@ -20,7 +21,7 @@ if [ $TAG_NAME != "master" ]; then RELEASE_BODY="nextcloud/desktop#$PR" fi -cd /build +cd ${DESKTOP_CLIENT_ROOT} # AppImage export APPIMAGE=$(readlink -f ./Nextcloud*.AppImage)