From 0f41caa265602f8a6bc9f30f28d9f726699075cb Mon Sep 17 00:00:00 2001 From: Carlos Hernandez Date: Wed, 9 Sep 2020 21:41:03 -0600 Subject: snap: Fix snapcraft builds #12879 * Use upstream git repo as snap source. * Fix typo in snapcraft.yaml Use latest_tag instead of branch because branch is undefined. --- snap/snapcraft.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 097d657613..57bcb72d5d 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -25,7 +25,7 @@ apps: parts: nvim: - source: . + source: https://github.com/neovim/neovim.git override-pull: | snapcraftctl pull latest_tag="$(git tag -l --sort=refname|head -1)" @@ -37,9 +37,9 @@ parts: 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)}" if [ "${version_prefix}" != "${git_described}" ]; then - VERSION="${version_prefix}-${git_described}-${branch}" + VERSION="${version_prefix}-${git_described}-${latest_tag}" else - VERSION="${version_prefix}-${branch}" + VERSION="${version_prefix}-${latest_tag}" fi snapcraftctl set-version "${VERSION}" plugin: make -- cgit