[GHA] Test Before Deploy Steps

Ref: #419

.github/workflows/action.yml

@@ -1,5 +1,4 @@
 # Build Script for Nginx Ultimate Bad Bot Blocker using GHA
-# 
 name: CI
 
 defaults:
@@ -14,17 +13,8 @@ on:
     branches:
       - master
 
-#services:
-#  nginx:
-#    image: nginx
-    # Map port 8080 on the Docker host to port 80 on the nginx container
-#    ports:
-#      - 8080:80
-      
 jobs:
   build:
-    #if: "!contains(github.event.head_commit.message, 'skipci')"
-    #if: "contains(github.event.head_commit.message, '[ci skip]')"
     runs-on: ubuntu-latest
 
     steps:
@@ -92,6 +82,11 @@ jobs:
           ./dev-tools/beta-test-blocker-rate-limiting.sh
           ./dev-tools/beta-test-blocker-whitelist.sh
 
+      - name: Deploy Latest Package
+        shell: bash
+        run: |
+          #./dev-tools/modify-files-and-commit.sh
+
       - name: Debug
         shell: bash
         run: | 

dev-tools/generate-blacklist-testing-of-changes.sh

@@ -45,7 +45,9 @@
 
 YEAR=$(date +"%Y")
 MONTH=$(date +"%m")
-MY_GIT_TAG=V3.${YEAR}.${MONTH}.${TRAVIS_BUILD_NUMBER}
+lastbuild=$(cat ./dev-tools/buildnumber)
+thisbuild=$((lastbuild + 1))
+MY_GIT_TAG=V3.${YEAR}.${MONTH}.${thisbuild}
 BAD_REFERRERS=$(wc -l < ./_generator_lists/bad-referrers.list)
 BAD_BOTS=$(wc -l < ./_generator_lists/bad-user-agents.list)
 _now="$(date)"

dev-tools/generate-blacklist.sh

@@ -45,7 +45,12 @@
 
 YEAR=$(date +"%Y")
 MONTH=$(date +"%m")
-MY_GIT_TAG=V4.${YEAR}.${MONTH}.${TRAVIS_BUILD_NUMBER}
+
+lastbuild=$(cat ./dev-tools/buildnumber)
+thisbuild=$((lastbuild + 1))
+
+
+MY_GIT_TAG=V4.${YEAR}.${MONTH}.${thisbuild}
 BAD_REFERRERS=$(wc -l < ./_generator_lists/bad-referrers.list)
 BAD_BOTS=$(wc -l < ./_generator_lists/bad-user-agents.list)
 _now="$(date)"

dev-tools/generate-google-disavow.sh

@@ -16,6 +16,8 @@
 #                                                                            #
 ##############################################################################                                                                
 
+export TERM=xterm
+
 # ------------------------------------------------------------------------------
 # MIT License
 # ------------------------------------------------------------------------------

dev-tools/generate-robots.sh

@@ -45,6 +45,7 @@
 
 set -e
 set -o pipefail
+export TERM=xterm
 
 # ------------------------
 # Set Terminal Font Colors
@@ -78,7 +79,9 @@ sudo touch ./tmp/robots.txt
 
 YEAR=$(date +"%Y")
 MONTH=$(date +"%m")
-MY_GIT_TAG=V4.${YEAR}.${MONTH}.${TRAVIS_BUILD_NUMBER}
+lastbuild=$(cat ./dev-tools/buildnumber)
+thisbuild=$((lastbuild + 1))
+MY_GIT_TAG=V4.${YEAR}.${MONTH}.${thisbuild}
 BAD_REFERRERS=$(wc -l < ./_generator_lists/bad-referrers.list)
 BAD_BOTS=$(wc -l < ./_generator_lists/bad-user-agents.list)
 _now="$(date)"

dev-tools/modify-config-readme-files.sh

@@ -61,7 +61,9 @@ defaultcolor=$(tput setaf default)
 
 YEAR=$(date +%Y)
 MONTH=$(date +%m)
-MY_GIT_TAG=V4.${YEAR}.${MONTH}.${TRAVIS_BUILD_NUMBER}
+lastbuild=$(cat ./dev-tools/buildnumber)
+thisbuild=$((lastbuild + 1))
+MY_GIT_TAG=V4.${YEAR}.${MONTH}.${thisbuild}
 BAD_REFERRERS=$(wc -l < ./_generator_lists/bad-referrers.list)
 BAD_BOTS=$(wc -l < ./_generator_lists/bad-user-agents.list)
 FAKE_GOOGLE_BOTS=$(wc -l < ./_generator_lists/fake-googlebots.list)

dev-tools/modify-files-and-commit.sh

@@ -72,10 +72,10 @@ MONTH=$(date +"%m")
 
 lastbuild=$(cat ./dev-tools/buildnumber)
 thisbuild=$((lastbuild + 1))
-echo ${thisbuild} > ./dev-tools/buildnumber
 
 releaseNewVersion () {
 latestbuild=V4.${YEAR}.${MONTH}.${thisbuild}
+echo ${latestbuild}
 printf "\n"
 echo "${bold}${green}All Nginx Tests Completed"
 echo "${bold}${green}All Bot and Referrer Testing Completed"
@@ -83,25 +83,30 @@ echo "${bold}${green}All Function Testing Completed"
 echo "${bold}${magenta}Releasing ${latestbuild}"
 }
 
+updatebuildnumber () {
+echo ${thisbuild} > ./dev-tools/buildnumber
+}
+
 commitBuildChanges () {
+          updatebuildnumber
           git config --global user.name "mitchellkrogza"
           git config --global user.email "mitchellkrog@gmail.com"
           git add -A
-          git commit -m "${LATESTBUILD}"
+          git commit -m "${latestbuild}"
           git push
 }
 
 deployPackage () {
 printf "\n"
-echo "${bold}${green}DEPLOYING ${LATESTBUILD}"
+echo "${bold}${green}DEPLOYING ${latestbuild}"
 printf "\n"
           git config --global user.name "mitchellkrogza"
           git config --global user.email "mitchellkrog@gmail.com"
-          export GIT_TAG=V4.${YEAR}.${MONTH}.${thisbuild}
-          git tag ${GIT_TAG} -a -m "V4.${YEAR}.${MONTH}.${thisbuild}"
+          export GIT_TAG=${latestbuild}
+          git tag ${GIT_TAG} -a -m "${latestbuild}"
           sudo git push origin master && git push origin master --tags
 echo "${bold}${green}-------------------------------"
-echo "${bold}${green}Deploying V4.${YEAR}.${MONTH}.${TRAVIS_BUILD_NUMBER}"
+echo "${bold}${green}Deploying ${latestbuild}"
 echo "${bold}${green}-------------------------------"
 printf "\n\n"
 }
@@ -114,6 +119,7 @@ releaseNewVersion
 commitBuildChanges
 deployPackage
 
+
 # ----------------------
 # Exit With Error Number
 # ----------------------

dev-tools/prepare-robots-input.sh

@@ -41,6 +41,8 @@
 # SOFTWARE.
 # ------------------------------------------------------------------------------
 
+export TERM=xterm
+
 # ------------------------
 # Set Terminal Font Colors
 # ------------------------