From 98349b89356306cbb1cc987024e4618d35b5c331 Mon Sep 17 00:00:00 2001 From: Marc Di Luzio Date: Tue, 23 Jun 2020 18:47:59 +0100 Subject: [PATCH] Ensure we label with proper tags and version the build --- snap/snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 29a7b7e..55815cb 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -42,7 +42,7 @@ parts: override-pull: | snapcraftctl pull snapcraftctl set-version $(git describe --always --long --dirty --tags) - git describe --exact-match HEAD 2> /dev/null && snapcraftctl set-grade "stable" || snapcraftctl set-grade "devel" + git describe --exact-match --tags HEAD 2> /dev/null && snapcraftctl set-grade "stable" || snapcraftctl set-grade "devel" + sed -i "s/undefined/$(git describe --always --long --dirty --tags)/" pkg/version/version.go - # TODO: Add the version into the build itself (currently using ldflags) # TODO: Server needs /usr/share/dict/words