From: beierlm Date: Tue, 18 May 2021 17:36:04 +0000 (-0400) Subject: Update from master X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F10840%2F2;p=osm%2Fosmclient.git Update from master Fixes creation of version number when in a branch Change-Id: I0b6945dd526b820c99a4c0baa65e62ff3a214d60 Signed-off-by: beierlm --- diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e131f3b..d950852 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -16,7 +16,7 @@ ## name: osmclient base: core18 -version: git +adopt-info: client summary: A python client for orchestrating OSM description: | A python client for orchestrating Open Source Mano (OSM). @@ -75,4 +75,5 @@ parts: $SNAPCRAFT_PART_INSTALL/usr/bin/pip3 install -r requirements.txt $SNAPCRAFT_PART_INSTALL/usr/bin/pip3 install . rm -rf .tox + snapcraftctl set-version $(git describe --match v* --tags --long --dirty) snapcraftctl build