diff --git a/.travis.yml b/.travis.yml index 5f49424bf8..ed8e2f47cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ dist: xenial branches: only: - master + - v3.12.x # env: # - ARCH=x86_64 DOCKER_IMAGE=amd64/ubuntu:trusty @@ -57,17 +58,17 @@ script: - cmake -DCMAKE_INSTALL_PREFIX:PATH=../appdir/usr -Wno-dev -Dsqlcipher=1 -DSQLITE_ENABLE_JSON1=1 .. - make install - cd .. -- git rev-list master --count - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage" - chmod a+x linuxdeployqt-6-x86_64.AppImage -- export VERSION=$(printf "`master`-`git rev-list HEAD --count`-` git -C . rev-parse --short HEAD`") #$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file +- export VERSION=${TRAVIS_BRANCH}-`git -C . rev-parse --short HEAD` # linuxdeployqt uses this for naming the file - ./linuxdeployqt-6-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage after_success: - find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh - - bash upload.sh DB_Browser_for_SQLite*.AppImage* + - chmod a+x upload.sh + - UPLOADTOOL_ISPRERELEASE=true UPLOADTOOL_SUFFIX=$TRAVIS_BRANCH ./upload.sh DB_Browser_for_SQLite*.AppImage* notifications: email: diff --git a/installer/windows/variables.wxi b/installer/windows/variables.wxi index 33a34fa231..7bb5f5e8a1 100644 --- a/installer/windows/variables.wxi +++ b/installer/windows/variables.wxi @@ -3,7 +3,7 @@ - +