From ad1bf288157f7ec3f1a6251ee5c71c751aef4d72 Mon Sep 17 00:00:00 2001 From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com> Date: Fri, 14 Jan 2022 17:17:24 -0600 Subject: [PATCH] Fix snap (#2255) * fixing snap on ubuntu * remove release candidates from snapcraft release --- snapcraft.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 2e141ba7..6714d9f3 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -12,7 +12,8 @@ description: | tools. grade: stable # must be 'stable' to release into candidate/stable channels confinement: strict # use 'strict' once you have the right plugs and slots -#confinement: devmode # use 'strict' once you have the right plugs and slots +#confinement: devmode # use 'strict' once you have the right plugs and slot +compression: lzo architectures: - build-on: amd64 @@ -28,7 +29,6 @@ apps: QT_QPA_PLATFORMTHEME: gtk3 slots: [dbus-flameshot] plugs: - - kde-frameworks-5-plug - home - removable-media - network @@ -36,6 +36,9 @@ apps: - opengl - x11 - wayland + - desktop + - desktop-legacy + - unity7 parts: flameshot: @@ -46,7 +49,8 @@ parts: source-type: git override-pull: | snapcraftctl pull - last_committed_tag="$(git tag -l --sort=-v:refname | head -1)" + # remove release candidates + last_committed_tag="$(git tag -l --sort=-v:refname | grep -v rc | head -1)" git_revno="$(git rev-list $(git describe --tags --abbrev=0)..HEAD --count)" git_hash="$(git rev-parse --short HEAD)" snapcraftctl set-version "${last_committed_tag}+git${git_revno}.${git_hash}"