fixed version for travis

BeamMW · Jan 17, 2019 · 1e62712 · 1e62712
1 parent 3f8dcf9
commit 1e62712
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,15 +11,15 @@ matrix:
     - os: osx
       language: cpp
       osx_image: xcode9.3
-      before_install: 
+      install: 
         - export TZ=Etc/GMT-3
         - brew update
         - brew unlink cmake
         - brew unlink boost 
         - brew install qt5 cmake boost
         - brew link qt5 --force
         - export PATH=/usr/local/opt/qt/bin:$PATH
-        - export BEAM_WALLET_UI_IN="BeamWallet-0.0.1-Darwin.dmg"
+        - export BEAM_WALLET_UI_IN="BeamWallet-$BEAM_VERSION-Darwin.dmg"
         - export OPENSSL_ROOT_DIR="/usr/local/opt/openssl"
         - export BEAM_WALLET_UI_OUT_VERLESS="Beam-Wallet.dmg"
       env: 
@@ -36,7 +36,7 @@ matrix:
     - os: osx
       language: cpp
       osx_image: xcode9.3
-      before_install:
+      install:
         - export TZ=Etc/GMT-3
         - brew update
         - brew unlink cmake
@@ -47,7 +47,7 @@ matrix:
         - export OPENSSL_ROOT_DIR="/usr/local/opt/openssl"
         - export QT5_ROOT_DIR="/usr/local/qt5-static"
         - export QML_IMPORT_PATH="/usr/local/qt5-static/qml"
-        - export BEAM_WALLET_UI_IN="BeamWallet-0.0.1-Darwin.dmg"
+        - export BEAM_WALLET_UI_IN="BeamWallet-$BEAM_VERSION-Darwin.dmg"
         - export BEAM_WALLET_UI_OUT_VERLESS="Beam-Wallet.dmg"
       env: 
         - BUILD_TYPE=Release
@@ -63,7 +63,7 @@ matrix:
     - os: osx
       language: cpp
       osx_image: xcode9.3
-      before_install:
+      install:
         - export TZ=Etc/GMT-3
         - brew update
         - brew unlink cmake
@@ -74,7 +74,7 @@ matrix:
         - export OPENSSL_ROOT_DIR="/usr/local/opt/openssl"
         - export QT5_ROOT_DIR="/usr/local/qt5-static"
         - export QML_IMPORT_PATH="/usr/local/qt5-static/qml"
-        - export BEAM_WALLET_UI_IN="BeamWallet-0.0.1-Darwin.dmg"
+        - export BEAM_WALLET_UI_IN="BeamWallet-$BEAM_VERSION-Darwin.dmg"
         - export BEAM_WALLET_UI_OUT_VERLESS="Beam-Wallet.dmg"
       env: 
         - BUILD_TYPE=Release
@@ -99,7 +99,7 @@ matrix:
             - libboost-all-dev
             - libssl-dev
             - curl
-      before_install:
+      install:
         - export TZ=Etc/GMT-3
         - wget "https://cmake.org/files/v3.12/cmake-3.12.0-Linux-x86_64.sh"
         - sudo sh cmake-3.12.0-Linux-x86_64.sh --skip-license --prefix=/usr
@@ -108,7 +108,7 @@ matrix:
         - sudo apt-get install qt510declarative qt510svg libgl1-mesa-dev-lts-xenial
         - eval "CC=gcc-7 && CXX=g++-7"
         - export PATH=/opt/qt510/bin:$PATH
-        - export BEAM_WALLET_UI_IN="BeamWallet-0.0.1-Linux.deb"
+        - export BEAM_WALLET_UI_IN="BeamWallet-$BEAM_VERSION-Linux.deb"
         - export BEAM_WALLET_UI_OUT_VERLESS="Beam-Wallet.deb"
       env: 
         - BUILD_TYPE=Debug
@@ -134,15 +134,15 @@ matrix:
             - curl
             - libxi-dev
             - libcups2-dev
-      before_install:
+      install:
         - export TZ=Etc/GMT-3
         - wget "https://cmake.org/files/v3.12/cmake-3.12.0-Linux-x86_64.sh"
         - sudo sh cmake-3.12.0-Linux-x86_64.sh --skip-license --prefix=/usr
         - eval "CC=gcc-7 && CXX=g++-7"
         - git clone --depth=1 https://github.com/nesbox/qt5-static-linux.git /home/travis/qt5-static
         - export QT5_ROOT_DIR="/home/travis/qt5-static"
         - export QML_IMPORT_PATH="/home/travis/qt5-static/qml"
-        - export BEAM_WALLET_UI_IN="BeamWallet-0.0.1-Linux.deb"
+        - export BEAM_WALLET_UI_IN="BeamWallet-$BEAM_VERSION-Linux.deb"
         - export BEAM_WALLET_UI_OUT_VERLESS="Beam-Wallet.deb"
       env: 
         - BUILD_TYPE=Release
@@ -168,7 +168,7 @@ matrix:
             - curl
             - libxi-dev
             - libcups2-dev
-      before_install:
+      install:
         - export TZ=Etc/GMT-3
         - sudo apt install ocl-icd-* opencl-headers
         - wget "https://cmake.org/files/v3.12/cmake-3.12.0-Linux-x86_64.sh"
@@ -177,7 +177,7 @@ matrix:
         - git clone --depth=1 https://github.com/nesbox/qt5-static-linux.git /home/travis/qt5-static
         - export QT5_ROOT_DIR="/home/travis/qt5-static"
         - export QML_IMPORT_PATH="/home/travis/qt5-static/qml"
-        - export BEAM_WALLET_UI_IN="BeamWallet-0.0.1-Linux.deb"
+        - export BEAM_WALLET_UI_IN="BeamWallet-$BEAM_VERSION-Linux.deb"
         - export BEAM_WALLET_UI_OUT_VERLESS="Beam-Wallet.deb"
       env: 
         - BUILD_TYPE=Release
@@ -202,7 +202,6 @@ matrix:
           - platform-tools
       install:
         - echo y | sdkmanager "ndk-bundle"
-      before_install:
         - wget "https://cmake.org/files/v3.12/cmake-3.12.0-Linux-x86_64.sh"
         - sudo sh cmake-3.12.0-Linux-x86_64.sh --skip-license --prefix=/usr
         - sudo git clone --depth=1 https://github.com/nesbox/boost_1_68-android.git /usr/local/boost_1_68-android
@@ -235,7 +234,6 @@ matrix:
           - platform-tools
       install:
         - echo y | sdkmanager "ndk-bundle"
-      before_install:
         - wget "https://cmake.org/files/v3.12/cmake-3.12.0-Linux-x86_64.sh"
         - sudo sh cmake-3.12.0-Linux-x86_64.sh --skip-license --prefix=/usr
         - sudo git clone --depth=1 https://github.com/nesbox/boost_1_68-android.git /usr/local/boost_1_68-android
@@ -258,8 +256,10 @@ matrix:
 ###############################################################################
 
 # TODO: version detection should be in one place
+before_install:
+  - BEAM_VERSION="1.1.$(git rev-list HEAD --count)"
+
 before_script:
-  - BEAM_VERSION="1.0.$(git rev-list HEAD --count)"
   - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/master/install | bash
 
 after_success: