Merge branch 'macos-build-number-take-2' into 'master'

Make macOS .dmg use correct build number, take 2 See merge request b0/spectral!37
2019-01-06 07:37:48 +00:00 · 2019-01-06 07:37:48 +00:00 · 09f69ea5fa
parent d3d0128a97 e7adc0098f
commit 09f69ea5fa
2 changed files with 7 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,5 +1,8 @@
 language: cpp

+git:
+  depth: false
+
 matrix:
  include:
  - os: osx
@ -17,7 +20,7 @@ script:

 before_deploy:
 - mv ${DEPLOY_DIR}/bin/spectral.dmg ./
- sed -i -e "s/TRAVIS_BUILD_NUMBER/${TRAVIS_BUILD_NUMBER}/g" .ci/bintray-release.json
+- sed -i -e "s/TRAVIS_BUILD_NUMBER/$(git rev-list --count HEAD)/g" .ci/bintray-release.json

 deploy:
  - provider: bintray
--- a/BUILD.md
+++ b/BUILD.md
@ -3,6 +3,7 @@
 1. Update Qt to v5.10+

        brew install qt5
+        brew link qt5 --force

 2. Download Spectral source

@ -16,8 +17,8 @@

 4. Build Spectral

-        /usr/local/Cellar/qt5/5.10.1/bin/qmake 
-        make
+        qmake ../spectral.pro
+        make -j4

 5. Open Spectral