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.
This commit is contained in:
Carlos Hernandez 2020-09-09 21:41:03 -06:00 committed by GitHub
parent a621c45ba0
commit 0f41caa265
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -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