Append commit abbreviation to the snap version for non-release builds #2234

Merged
PeterSurda merged 2 commits from gitea-95 into v0.6 2024-05-20 01:06:23 +02:00
2 changed files with 8 additions and 1 deletions

View File

@ -1,5 +1,12 @@
#!/bin/bash #!/bin/bash
git remote add -f upstream https://github.com/Bitmessage/PyBitmessage.git
HEAD="$(git rev-parse HEAD)"
UPSTREAM="$(git merge-base --fork-point upstream/v0.6)"
SNAP_DIFF="$(git diff upstream/v0.6 -- packages/snap .buildbot/snap)"
[ -z "${SNAP_DIFF}" ] && [ $HEAD != $UPSTREAM ] && exit 0
pushd packages && snapcraft || exit 1 pushd packages && snapcraft || exit 1
popd popd

View File

@ -28,7 +28,7 @@ parts:
source: https://github.com/Bitmessage/PyBitmessage.git source: https://github.com/Bitmessage/PyBitmessage.git
override-pull: | override-pull: |
snapcraftctl pull snapcraftctl pull
snapcraftctl set-version $(git describe --tags --abbrev=0 | tr -d v) snapcraftctl set-version $(git describe --tags | cut -d- -f1,3 | tr -d v)
plugin: python plugin: python
python-version: python2 python-version: python2
build-packages: build-packages: