From bae806cf0e519e77c57b41a6ad34eec20179dbbd Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Wed, 28 Aug 2024 14:59:34 +0200 Subject: [PATCH] fix snapcraft&aur --- .github/workflows/aur-release.yml | 2 +- packages/snap/snapcraft.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/aur-release.yml b/.github/workflows/aur-release.yml index ae16da2..a62a994 100644 --- a/.github/workflows/aur-release.yml +++ b/.github/workflows/aur-release.yml @@ -12,7 +12,7 @@ jobs: env: RELEASE_TAG: ${{ github.ref }} run: | - version=$([ -n "${RELEASE_TAG}" ] && (echo "${RELEASE_TAG}" | sed 's#^.*v##g') || (cat dotdrop/version.py | grep version |sed "s/^__vers.*= '\([^']*\)'/\1/g")) + version=$([ -n "${RELEASE_TAG}" ] && (echo "${RELEASE_TAG}" | sed 's#^.*v##g') || (cat dotdrop/version.py | grep version | sed 's/^.*= .\(.*\).$/\1/g')) sed -i "s/^pkgver=.*$/pkgver=${version}/g" packages/arch-dotdrop/PKGBUILD cat packages/arch-dotdrop/PKGBUILD - name: Publish to aur diff --git a/packages/snap/snapcraft.yaml b/packages/snap/snapcraft.yaml index 664ebeb..7b4ad36 100644 --- a/packages/snap/snapcraft.yaml +++ b/packages/snap/snapcraft.yaml @@ -38,7 +38,10 @@ parts: source: . plugin: nil override-build: | - VERSION=$(git describe --abbrev=0 --tags | sed 's/^v//g') + VERSION="" + if [ hash git &>/dev/null ]; then + VERSION=$(git describe --abbrev=0 --tags | sed 's/^v//g') + fi if [ -z ${VERSION} ]; then VERSION=$(cat dotdrop/version.py | grep version | sed 's/^.*= .\(.*\).$/\1/g') fi