Remove merge feature branch to develop

Author: ggeop

.travis.yml

@@ -25,7 +25,6 @@ jobs:
         # With this way setup script (setup.sh) is validated
         - sudo bash run_tests.sh
       after_success:
-        - bash bin/deploy/new_release_auto_tagging.sh
         - sudo bash bin/deploy/merge_develop_to_master.sh
 
     - stage: deploy
@@ -34,6 +33,7 @@ jobs:
       env:
         - RELEASE_PACKAGE=jarvis_package.tar
       before_deploy:
+        - bash bin/deploy/new_release_auto_tagging.sh
         - bash bin/deploy/create_release_package.sh
       deploy:
         provider: releases
@@ -45,7 +45,7 @@ jobs:
 
 stages:
   - name: test
-    if: branch!=master AND branch!=^untagged.*
+    if: branch!=master AND branch!=develop AND branch!=^untagged.*
   - name: merge (develop --> master)
     if: branch=develop AND type!=pull_request
   - name: deploy

bin/deploy/merge_develop_to_master.sh

@@ -7,7 +7,7 @@ if [ "$TRAVIS_BRANCH" == "develop" ]; then
     git fetch
     git reset --hard
     git checkout master || echo "Git checkout master failed"
-    git merge "$TRAVIS_COMMIT" || echo "Merge develop to master failed"
+    git merge --ff-only "$TRAVIS_COMMIT" || echo "Merge develop to master failed"
     git push -q https://$GITHUB_TOKEN@github.com/ggeop/Python-ai-assistant master
 fi
 

bin/deploy/new_release_auto_tagging.sh

@@ -7,4 +7,5 @@ echo "Add tags to new release"
 git config --global user.email "[email protected]"
 git config --global user.name "Travis CI"
 export GIT_TAG=Release_v.$TRAVIS_BUILD_NUMBER
-git tag $GIT_TAG -a -m "Generated tag from TravisCI for build $TRAVIS_BUILD_NUMBER"
+git tag $GIT_TAG -a -m "Generated tag from TravisCI for build $TRAVIS_BUILD_NUMBER"
+git push -q https://$GITHUB_TOKEN@github.com/ggeop/Python-ai-assistant --tags