chaneg deploy sequence / tagging / commits

Author: mitchellkrogza

.travis.yml

@@ -38,6 +38,7 @@ script:
   - STATUSCODE=$(curl -A "masscan" http://localhost:9000/index.php &> /dev/stderr --write-out "%{http_code}") | if test $STATUSCODE 52; then exit 0; fi
   - STATUSCODE=$(curl -I http://localhost:9000/index.php -e http://100dollars-seo.com &> /dev/stderr --write-out "%{http_code}") | if test $STATUSCODE 52; then exit 0; fi
   - STATUSCODE=$(curl -I http://localhost:9000/index.php -e http://zx6.ru &> /dev/stderr --write-out "%{http_code}") | if test $STATUSCODE 52; then exit 0; fi
+  - travis-ci/before-deploy.sh
 
 before_deploy:
 #- git remote -v

travis-ci/before-deploy.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+YEAR=$(date +"%Y")
+MONTH=$(date +"%m")
+sudo git remote -v
+sudo git remote rm origin
+sudo git config --global user.email "${GIT_EMAIL}"
+sudo git config --global user.name "${GIT_NAME}"
+sudo git config --global push.default simple
+export GIT_TAG=v1.0.$TRAVIS_BUILD_NUMBER
+#msg="Tag Generated from TravisCI for build $TRAVIS_BUILD_NUMBER"
+#echo "$msg" >> $TRAVIS_BUILD_DIR/build.txt
+#git add $TRAVIS_BUILD_DIR/build.txt
+sudo $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
+sudo git add $TRAVIS_BUILD_DIR/globalblacklist.conf
+sudo git commit -m "Build $TRAVIS_BUILD_NUMBER"

travis-ci/deploy.sh

@@ -8,9 +8,9 @@ sudo git config --global push.default simple
 #export GIT_TAG=V2.$YEAR-$MONTH.$TRAVIS_BUILD_NUMBER
 export GIT_TAG=v1.0.$TRAVIS_BUILD_NUMBER
 git fetch --tags
-msg="Tag Generated from TravisCI for build $TRAVIS_BUILD_NUMBER"
+msg="Build $TRAVIS_BUILD_NUMBER"
 if git tag $GIT_TAG -a -m "$msg" 2>/dev/null; then
-sudo git tag $GIT_TAG -a -m "Tag Generated from TravisCI for build $TRAVIS_BUILD_NUMBER"
+sudo git tag $GIT_TAG -a -m "Build $TRAVIS_BUILD_NUMBER"
 sudo git push origin master && git push origin master --tags
 ls -aR
 else echo Tag already exists!; fi

travis-ci/install-nginx2.sh

@@ -85,19 +85,20 @@ sudo ./update-ngxblocker
 sudo service nginx reload
 sudo chmod +x $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
 sudo chmod +x $TRAVIS_BUILD_DIR/travis-ci/deploy.sh
-sudo $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
-cd $TRAVIS_BUILD_DIR
-sudo git remote -v
-sudo git remote rm origin
+sudo chmod +x $TRAVIS_BUILD_DIR/travis-ci/before-deploy.sh
+#sudo $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
+#cd $TRAVIS_BUILD_DIR
+#sudo git remote -v
+#sudo git remote rm origin
 #cat $TRAVIS_BUILD_DIR/globalblacklist.conf
-sudo git config --global user.email "${GIT_EMAIL}"
-sudo git config --global user.name "${GIT_NAME}"
-sudo git config --global push.default simple
+#sudo git config --global user.email "${GIT_EMAIL}"
+#sudo git config --global user.name "${GIT_NAME}"
+#sudo git config --global push.default simple
 #sudo export GIT_TAG=v1.0.$TRAVIS_BUILD_NUMBER
 #msg="Build $TRAVIS_BUILD_NUMBER"
 #echo "$msg" >> $TRAVIS_BUILD_DIR/build.txt
-sudo git add $TRAVIS_BUILD_DIR/globalblacklist.conf
-sudo git commit -m "Build $TRAVIS_BUILD_NUMBER"
+#sudo git add $TRAVIS_BUILD_DIR/globalblacklist.conf
+#sudo git commit -m "Build $TRAVIS_BUILD_NUMBER"
 
 #sudo sed --version
 #sudo apt-cache policy dash