From 7f3b6c4846f16a1926e49e3bfde5f267779ee1a2 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Wed, 10 Jan 2018 16:00:20 +0200 Subject: [PATCH] Fix versioning on deb packages fixes #197 --- .ci/linux/create-packages.sh | 11 +++++++++++ .gitignore | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/.ci/linux/create-packages.sh b/.ci/linux/create-packages.sh index bd644fce..18e57769 100755 --- a/.ci/linux/create-packages.sh +++ b/.ci/linux/create-packages.sh @@ -7,6 +7,17 @@ DIR=package.dir TAG=`git tag -l --points-at HEAD` +# Strip `v` from the version tag. +if [[ $TAG == v* ]]; then + TAG=${TAG#?}; +fi + +# Prepend nightly with the latest version. +if [[ $TAG == "nightly" ]]; then + LATEST_VERSION=`git tag -l | grep "^v" | sort | head -n 1` + TAG=${LATEST_VERSION#?}.nightly +fi + # Installing dependencies on travis. if [ ! -z "$TRAVIS_OS_NAME" ]; then sudo apt-add-repository -y ppa:brightbox/ruby-ng diff --git a/.gitignore b/.gitignore index e7df9077..902e90e4 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,8 @@ dist/MacOS/nheko.app/Contents/MacOS/nheko # AppImage *.AppImage *.AppDir + +# Artifacts +*.rpm +*.deb +package.dir