Fixes for deployment with Travis

RWTH-HPC · Mar 2, 2016 · 6f173e3 · 6f173e3
1 parent de54e2d
commit 6f173e3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -74,8 +74,8 @@ script:
 - make
 
 before_deploy:
-  - cd ${TRAVIS_BUILD_DIR}/build/release
-  - ${TRAVIS_BUILD_DIR}/tools/mac_osx_deploy.sh $TRAVIS_TAG $CRYPT
+  - if [ "$DEPLOY" = "true" ]; then echo "Deployment for tag $TRAVIS_TAG $CRYPT"; fi
+  - if [ "$DEPLOY" = "true" ]; then cd ${TRAVIS_BUILD_DIR}/build/release && ${TRAVIS_BUILD_DIR}/tools/mac_osx_deploy.sh $TRAVIS_TAG $CRYPT; fi
 
 deploy:
   provider: releases
@@ -86,4 +86,5 @@ deploy:
   skip_cleanup: true
   on:
     all_branches: true
+    tags: true
     condition: "$DEPLOY = true"
diff --git a/tools/mac_osx_deploy.sh b/tools/mac_osx_deploy.sh
@@ -5,11 +5,9 @@ if [ "$#" -eq 0 ]; then
 else
   APP="EffortLog"
   if [ "$#" -eq 1 ]; then
-    /usr/local/opt/qt5/bin/macdeployqt ${APP}.app -always-overwrite -verbose=2 -qmldir=qml -dmg
-    mv ${APP}.dmg ${APP}_v$1.dmg
+    /usr/local/opt/qt5/bin/macdeployqt ${APP}.app -always-overwrite -verbose=2 -qmldir=qml -dmg && mv ${APP}.dmg ${APP}_$1.dmg
   elif [ $2 = "CRYPT" ]; then
-    /usr/local/opt/qt5/bin/macdeployqt ${APP}.app -always-overwrite -verbose=2 -qmldir=qml -dmg
-    mv ${APP}.dmg ${APP}_v$1_encrypted.dmg
+    /usr/local/opt/qt5/bin/macdeployqt ${APP}.app -always-overwrite -verbose=2 -qmldir=qml -dmg && mv ${APP}.dmg ${APP}_$1_encrypted.dmg
   else
     echo "Unknown parameter < $2 >"
   fi

diff --git a/tools/windows_deploy.bat b/tools/windows_deploy.bat
@@ -1,4 +1,4 @@
 mkdir %APPVEYOR_BUILD_FOLDER%\build\release\dist
 move %APPVEYOR_BUILD_FOLDER%\build\release\effort-log.exe %APPVEYOR_BUILD_FOLDER%\build\release\dist\effort-log.exe
 %QTDIR%\bin\windeployqt %APPVEYOR_BUILD_FOLDER%\build\release\dist\effort-log.exe
-7z a %APPVEYOR_BUILD_FOLDER%\effort-log_v%APPVEYOR_REPO_TAG_NAME%_win32.zip %APPVEYOR_BUILD_FOLDER%\build\release\dist\*
+7z a %APPVEYOR_BUILD_FOLDER%\effort-log_%APPVEYOR_REPO_TAG_NAME%_win32.zip %APPVEYOR_BUILD_FOLDER%\build\release\dist\*
diff --git a/tools/windows_deploy_encrypted.bat b/tools/windows_deploy_encrypted.bat
@@ -3,4 +3,4 @@ mkdir %APPVEYOR_BUILD_FOLDER%\build\release\dist
 copy C:\OpenSSL-Win32\libeay32.dll %APPVEYOR_BUILD_FOLDER%\build\release\dist\libeay32.dll
 copy C:\OpenSSL-Win32\libssl32.dll %APPVEYOR_BUILD_FOLDER%\build\release\dist\libssl32.dll
 copy C:\OpenSSL-Win32\ssleay32.dll %APPVEYOR_BUILD_FOLDER%\build\release\dist\ssleay32.dll
-7z a %APPVEYOR_BUILD_FOLDER%\effort-log_v%APPVEYOR_REPO_TAG_NAME%_win32_encrypted.zip %APPVEYOR_BUILD_FOLDER%\build\release\dist\*
+7z a %APPVEYOR_BUILD_FOLDER%\effort-log_%APPVEYOR_REPO_TAG_NAME%_win32_encrypted.zip %APPVEYOR_BUILD_FOLDER%\build\release\dist\*