Fix stages

Author: ggeop

.travis.yml

@@ -21,16 +21,16 @@ jobs:
     - stage: merge (develop --> master)
       install: skip
       script:
+        - bash bin/deploy/new_release_auto_tagging.sh
         - sudo bash bin/deploy/merge_develop_to_master.sh
     - stage: deploy
       install: skip
       script: skip
       env:
         - RELEASE_PACKAGE=jarvis_package.tar
       before_deploy:
-#        - sudo bash setup.sh
-#        - sudo bash run_tests.sh
-        - bash bin/deploy/new_release_auto_tagging.sh
+        - sudo bash setup.sh
+        - sudo bash run_tests.sh
         - bash bin/deploy/create_release_package.sh
       deploy:
         provider: releases