From 07639011daa5ff84b61e76b0ad0dc8e659c5a68b Mon Sep 17 00:00:00 2001 From: vit9696 Date: Sun, 29 Jan 2017 23:29:34 -0800 Subject: [PATCH] fix(build): do not invoke version update on travis Suggested by zetok due to travis not fetching all the commits. --- osx/info.plist | 4 ++-- osx/qTox-Mac-Deployer-ULTIMATE.sh | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/osx/info.plist b/osx/info.plist index 4913a4e31..123c794ce 100644 --- a/osx/info.plist +++ b/osx/info.plist @@ -65,7 +65,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - @SHORT_VERSION@ + 1.7.0 CFBundleSignature toxq CFBundleURLTypes @@ -84,7 +84,7 @@ CFBundleVersion - @FULL_VERSION@ + 1.7.0 NSPrincipalClass NSApplication UTImportedTypeDeclarations diff --git a/osx/qTox-Mac-Deployer-ULTIMATE.sh b/osx/qTox-Mac-Deployer-ULTIMATE.sh index d9dcb5c22..baff70d13 100755 --- a/osx/qTox-Mac-Deployer-ULTIMATE.sh +++ b/osx/qTox-Mac-Deployer-ULTIMATE.sh @@ -216,11 +216,13 @@ update() { build() { fcho "------------------------------" fcho "Starting build process ..." - # update version info - cd $QTOX_DIR - fcho "Now working in ${PWD}" - fcho "Setting the version ..." - ./tools/update-versions.sh + if [[ $TRAVIS != true ]]; then + # update version info + cd $QTOX_DIR + fcho "Now working in ${PWD}" + fcho "Setting the version ..." + ./tools/update-versions.sh + fi rm -rf $BUILD_DIR rm -rf $DEPLOY_DIR