Use raiden version in AppImage bundling

raiden-network · Sep 1, 2017 · 55d5ac1 · 55d5ac1
1 parent 83d3865
commit 55d5ac1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -49,7 +49,7 @@ jobs:
     before_install: if [ -n "$TRAVIS_TAG" ]; then mkdir -p $HOME/.bin; export PATH=$PATH:$HOME/.bin; ./.travis/before_install.sh; fi
     install: if [ -n "$TRAVIS_TAG" ]; then . .travis/install.sh; fi
     before_script: if [ -n "$TRAVIS_TAG" ]; then . .travis/before_script; fi
-    script: if [ -n "$TRAVIS_TAG" ]; then make bundle; fi
+    script: if [ -n "$TRAVIS_TAG" ]; then RAIDENVERSION=$TRAVIS_TAG make bundle; fi
     env: TEST_TYPE=""
     deploy:
     - provider: releases

diff --git a/Makefile b/Makefile
@@ -58,6 +58,7 @@ docs:
 	$(MAKE) -C docs clean
 	$(MAKE) -C docs html
 
+RAIDENVERSION ?= 'master'
 bundle:
 	# pass RAIDENVERSION=<git version tag> to build a specific version
 	docker build -t raidenbundler --build-arg RAIDENVERSION=$(RAIDENVERSION) -f docker/build.Dockerfile docker

diff --git a/docker/build.Dockerfile b/docker/build.Dockerfile
@@ -71,7 +71,7 @@ WORKDIR /
 # add .desktop file
 ADD raiden.desktop /raiden.AppDir/raiden.desktop
 RUN cd /apps/raiden && \
-    VERSIONSTRING=${RAIDENVERSION:-"git-"$(git rev-parse HEAD)} && \
+    VERSIONSTRING=$(raiden version --short) && \
     sed -s -i "s/XXVERSIONXX/$VERSIONSTRING/" /raiden.AppDir/raiden.desktop
 # add icon
 ADD raiden.svg /raiden.AppDir/raiden.svg