Explorar o código

Merge branch 'feature/shellcheck-travis' into develop

Daniel Gibbs %!s(int64=8) %!d(string=hai) anos
pai
achega
56b52b7720
Modificáronse 4 ficheiros con 33 adicións e 12 borrados
  1. 8 4
      .travis.yml
  2. 3 2
      tests/tests_jc2server.sh
  3. 19 4
      tests/tests_shellcheck.sh
  4. 3 2
      tests/tests_ts3server.sh

+ 8 - 4
.travis.yml

@@ -32,7 +32,11 @@ addons:
     - iproute2
     - shellcheck
 
-script:
-    - bash tests/tests_jc2server.sh
-    - bash tests/tests_ts3server.sh
-    - bash tests/tests_shellcheck.sh
+jobs:
+  include:
+    - stage: jobs
+      script: bash tests/tests_jc2server.sh
+    - # stage name not required
+      script: bash tests/tests_ts3server.sh
+    - # stage name not required
+      script: bash tests/tests_shellcheck.sh

+ 3 - 2
tests/tests_jc2server.sh

@@ -2,7 +2,7 @@
 # Project: Game Server Managers - LinuxGSM
 # Author: Daniel Gibbs
 # License: MIT License, Copyright (c) 2017 Daniel Gibbs
-# Purpose: TravisCI Tests: Just Cause 2 | Linux Game Server Management Script
+# Purpose: Travis CI Tests: Just Cause 2 | Linux Game Server Management Script
 # Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors
 # Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki
 # Website: https://linuxgsm.com
@@ -460,9 +460,10 @@ fn_test_result_fail(){
 }
 
 echo "================================="
-echo "TravisCI Tests"
+echo "Travis CI Tests"
 echo "Linux Game Server Manager"
 echo "by Daniel Gibbs"
+echo "Contributors: http://goo.gl/qLmitD"
 echo "https://linuxgsm.com"
 echo "================================="
 echo ""

+ 19 - 4
tests/tests_shellcheck.sh

@@ -2,14 +2,29 @@
 # Project: Game Server Managers - LinuxGSM
 # Author: Daniel Gibbs
 # License: MIT License, Copyright (c) 2017 Daniel Gibbs
-# Purpose: TravisCI Tests: Shellcheck | Linux Game Server Management Script
+# Purpose: Travis CI Tests: Shellcheck | Linux Game Server Management Script
 # Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors
 # Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki
-# Website: https://linuxgsm.com
+# Website: https://gameservermanagers.com
 
-echo "START Shellcheck"
 echo "================================="
+echo "Travis CI Tests"
+echo "Linux Game Server Manager"
+echo "by Daniel Gibbs"
+echo "Contributors: http://goo.gl/qLmitD"
+echo "https://linuxgsm.com"
+echo "================================="
+echo ""
+echo "================================="
+echo "Bash Analysis Tests"
+echo "Using: Shellcheck"
+echo "Testing Branch: $TRAVIS_BRANCH"
+echo "================================="
+echo ""
 find . -type f -name "*.sh" -not -path "./shunit2-2.1.6/*" -exec shellcheck --shell=bash --exclude=SC2154,SC2034 {} \;
 find . -type f -name "*.cfg" -not -path "./shunit2-2.1.6/*" -exec shellcheck --shell=bash --exclude=SC2154,SC2034 {} \;
+echo ""
 echo "================================="
-echo "END Shellcheck"
+echo "Bash Analysis Tests - Complete!"
+echo "Using: Shellcheck"
+echo "================================="

+ 3 - 2
tests/tests_ts3server.sh

@@ -2,7 +2,7 @@
 # Project: Game Server Managers - LinuxGSM
 # Author: Daniel Gibbs
 # License: MIT License, Copyright (c) 2017 Daniel Gibbs
-# Purpose: TravisCI Tests: Teamspeak 3 | Linux Game Server Management Script
+# Purpose: Travis CI Tests: Teamspeak 3 | Linux Game Server Management Script
 # Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors
 # Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki
 # Website: https://linuxgsm.com
@@ -460,9 +460,10 @@ fn_test_result_fail(){
 }
 
 echo "================================="
-echo "TravisCI Tests"
+echo "Travis CI Tests"
 echo "Linux Game Server Manager"
 echo "by Daniel Gibbs"
+echo "Contributors: http://goo.gl/qLmitD"
 echo "https://linuxgsm.com"
 echo "================================="
 echo ""