[vlc-commits] snap: make sure we don't fail with a missing git version

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jun 15 16:33:25 2020 +0200| [9c717634d3164543ac4b2aa076b6e022a0e78a47] | committer: Steve Lhomme

snap: make sure we don't fail with a missing git version

This fixes CI failure on branches with a lot of patches.

(cherry picked from commit c4a79d9586958a43a2b4e98d279ef27c1ba1025d)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=9c717634d3164543ac4b2aa076b6e022a0e78a47
---

 extras/package/snap/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/package/snap/snapcraft.yaml b/extras/package/snap/snapcraft.yaml
index 273839f8d2..7d76835a57 100644
--- a/extras/package/snap/snapcraft.yaml
+++ b/extras/package/snap/snapcraft.yaml
@@ -95,7 +95,7 @@ parts:
           --disable-wayland \
           --enable-merge-ffmpeg
       make -j $(getconf _NPROCESSORS_ONLN)
-      echo $(git describe HEAD) > $SNAPCRAFT_STAGE/version
+      echo $(git describe --always HEAD) > $SNAPCRAFT_STAGE/version
       make install
       sed -i 's|Icon=vlc|Icon=/usr/share/icons/hicolor/256x256/apps/vlc\.png|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/vlc.desktop
       sed -i 's|TryExec=.*|TryExec=/snap/bin/vlc|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/vlc.desktop