diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11157a5fd3217dc817853e807e1bd052a84dd3a8..925bd8c18bb73914558c77e529f74c04d9643d01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,5 +8,5 @@ appimage: - ./scripts/package appimage artifacts: paths: - - build_*/pling-store*.AppImage + - build_*/pling-store*.AppImage* expire_in: 2 days diff --git a/pkg/appimage/appimagebuild b/pkg/appimage/appimagebuild index 38b3384854586193ed981b92eb60450708267caf..710f1136a7146b5571a95818b4a372b65a99b21b 100755 --- a/pkg/appimage/appimagebuild +++ b/pkg/appimage/appimagebuild @@ -2,9 +2,18 @@ PKGNAME='pling-store' PKGVER='5.0.1' -PKGREL='1' -UPDINFO='zsync|http://dl.opendesktop.org/api/files/download/id/1532435039/as/latest/ocs-store-x86_64.AppImage.zsync' +# Only timestamp development branches +if [ "${CI_COMMIT_REF_SLUG}" != "master" ]; then + PKGREL=dev-${CI_COMMIT_SHORT_SHA}-$(date +"%Y%m%d-%H%M%S") +else + PKGREL='1' +fi + +APPIMAGE_FILE_NAME=${PKGNAME}-${PKGVER}-${PKGREL}-x86_64.AppImage +ZSYNC_FILE_NAME=${PKGNAME}-${CI_COMMIT_REF_SLUG}-x86_64.AppImage.zsync + +UPDINFO="zsync|https://www.opencode.net/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/jobs/artifacts/${CI_COMMIT_REF_SLUG}/raw/build_pling-store/${ZSYNC_FILE_NAME}?job=appimage" APPDIR="${PKGNAME}.AppDir" make @@ -31,9 +40,8 @@ chmod 755 appimagetool ./appimagetool --appimage-extract ./squashfs-root/AppRun -u "${UPDINFO}" ${APPDIR} -# Only timestamp development branches -if [ "${CI_COMMIT_REF_SLUG}" != "master" ]; then - PKGREL=dev-${CI_COMMIT_SHORT_SHA}-$(date +"%Y%m%d-%H%M%S") -fi +# Fix url in zsync file +sed -i "/^URL:.*$/c\URL: ${APPIMAGE_FILE_NAME}?job=appimage" *-x86_64.AppImage.zsync -mv *-x86_64.AppImage ../${PKGNAME}-${PKGVER}-${PKGREL}-x86_64.AppImage +mv *-x86_64.AppImage ../${APPIMAGE_FILE_NAME} +mv *-x86_64.AppImage.zsync ../${ZSYNC_FILE_NAME}