aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Hernandez <carlos@techbyte.ca>2020-09-06 05:42:47 +0000
committerCarlos Hernandez <carlos@techbyte.ca>2020-09-06 05:42:47 +0000
commit8efebda2c6608ad7e55bb31f6aa5e5bcfbad3337 (patch)
treec923da3887bfc395712ef24df7c6b23f8206b769
parenta7d48cb960fdd545b568d383cc9fc5591b2dacf8 (diff)
downloadrneovim-8efebda2c6608ad7e55bb31f6aa5e5bcfbad3337.tar.gz
rneovim-8efebda2c6608ad7e55bb31f6aa5e5bcfbad3337.tar.bz2
rneovim-8efebda2c6608ad7e55bb31f6aa5e5bcfbad3337.zip
snap: Ensure version reflects Github release ver
-rw-r--r--snap/snapcraft.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b9dcea4a10..097d657613 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -36,7 +36,12 @@ parts:
version_prefix="v$major.$minor.$patch"
git_described="$(git describe --first-parent --dirty 2> /dev/null | perl -lpe 's/v\d.\d.\d-//g')"
git_described="${git_described:-$(git describe --first-parent --tags --always --dirty)}"
- snapcraftctl set-version "${version_prefix}-${git_described}"
+ if [ "${version_prefix}" != "${git_described}" ]; then
+ VERSION="${version_prefix}-${git_described}-${branch}"
+ else
+ VERSION="${version_prefix}-${branch}"
+ fi
+ snapcraftctl set-version "${VERSION}"
plugin: make
make-parameters:
- CMAKE_BUILD_TYPE=RelWithDebInfo