From d08b1862a41148f736e9b3fbb59cf2739f9be4bd Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Mar 2018 23:06:49 +0000 Subject: [PATCH 1/6] testing jobs --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24af341a5..72d1f0e25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,9 @@ addons: - iproute2 - shellcheck -script: - - bash tests/tests_jc2server.sh - - bash tests/tests_ts3server.sh - - bash tests/tests_shellcheck.sh \ No newline at end of file +jobs: + include: + - stage: jobs + script: bash tests/tests_jc2server.sh + script: bash tests/tests_ts3server.sh + script: bash tests/tests_shellcheck.sh \ No newline at end of file From 4a53fb0ade1799dccd48559fb135a6143236cd72 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Mar 2018 23:12:53 +0000 Subject: [PATCH 2/6] test --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 72d1f0e25..4645399ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,5 +36,5 @@ jobs: include: - stage: jobs script: bash tests/tests_jc2server.sh + - # stage name not required, will continue to use `test` script: bash tests/tests_ts3server.sh - script: bash tests/tests_shellcheck.sh \ No newline at end of file From 706bf40339f0142c5950a06bedfd2100510abb30 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Mar 2018 23:15:53 +0000 Subject: [PATCH 3/6] added language --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4645399ce..2b963b62d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,9 @@ addons: jobs: include: - stage: jobs + language: bash script: bash tests/tests_jc2server.sh - - # stage name not required, will continue to use `test` + - # stage name not required script: bash tests/tests_ts3server.sh + - # stage name not required + script: bash tests/tests_shellcheck.sh \ No newline at end of file From 687e77662bb4100ee549d499afbfaf041f2dbab4 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Mar 2018 23:25:37 +0000 Subject: [PATCH 4/6] Removed Language --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2b963b62d..1ae96fc9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,6 @@ addons: jobs: include: - stage: jobs - language: bash script: bash tests/tests_jc2server.sh - # stage name not required script: bash tests/tests_ts3server.sh From 4bafd924bc9d0a590e84f5178ec1ee7a8b12398a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Mar 2018 23:25:53 +0000 Subject: [PATCH 5/6] Updated Messages --- tests/tests_jc2server.sh | 4 ++-- tests/tests_shellcheck.sh | 20 +++++++++++++++++--- tests/tests_ts3server.sh | 4 ++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index c0d6d0b19..d92009913 100644 --- a/tests/tests_jc2server.sh +++ b/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://gameservermanagers.com @@ -460,7 +460,7 @@ fn_test_result_fail(){ } echo "=================================" -echo "TravisCI Tests" +echo "Travis CI Tests" echo "Linux Game Server Manager" echo "by Daniel Gibbs" echo "https://gameservermanagers.com" diff --git a/tests/tests_shellcheck.sh b/tests/tests_shellcheck.sh index 8970de676..0a272df89 100644 --- a/tests/tests_shellcheck.sh +++ b/tests/tests_shellcheck.sh @@ -2,14 +2,28 @@ # 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://gameservermanagers.com -echo "START Shellcheck" echo "=================================" +echo "Travis CI Tests" +echo "Linux Game Server Manager" +echo "by Daniel Gibbs" +echo "https://gameservermanagers.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" \ No newline at end of file +echo "Bash Analysis Tests - Complete!" +echo "Using: Shellcheck" +echo "=================================" \ No newline at end of file diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index 7f327dc13..fa3be9788 100644 --- a/tests/tests_ts3server.sh +++ b/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://gameservermanagers.com @@ -460,7 +460,7 @@ fn_test_result_fail(){ } echo "=================================" -echo "TravisCI Tests" +echo "Travis CI Tests" echo "Linux Game Server Manager" echo "by Daniel Gibbs" echo "https://gameservermanagers.com" From 81fb2095a57963bd8057802db038ceec6a3c485a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Mar 2018 23:30:09 +0000 Subject: [PATCH 6/6] Updated travis headers --- tests/tests_jc2server.sh | 3 ++- tests/tests_shellcheck.sh | 3 ++- tests/tests_ts3server.sh | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index d92009913..748ef431e 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -463,7 +463,8 @@ echo "=================================" echo "Travis CI Tests" echo "Linux Game Server Manager" echo "by Daniel Gibbs" -echo "https://gameservermanagers.com" +echo "Contributors: http://goo.gl/qLmitD" +echo "https://linuxgsm.com" echo "=================================" echo "" echo "=================================" diff --git a/tests/tests_shellcheck.sh b/tests/tests_shellcheck.sh index 0a272df89..0a9230226 100644 --- a/tests/tests_shellcheck.sh +++ b/tests/tests_shellcheck.sh @@ -11,7 +11,8 @@ echo "=================================" echo "Travis CI Tests" echo "Linux Game Server Manager" echo "by Daniel Gibbs" -echo "https://gameservermanagers.com" +echo "Contributors: http://goo.gl/qLmitD" +echo "https://linuxgsm.com" echo "=================================" echo "" echo "=================================" diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index fa3be9788..7ef5a4b33 100644 --- a/tests/tests_ts3server.sh +++ b/tests/tests_ts3server.sh @@ -463,7 +463,8 @@ echo "=================================" echo "Travis CI Tests" echo "Linux Game Server Manager" echo "by Daniel Gibbs" -echo "https://gameservermanagers.com" +echo "Contributors: http://goo.gl/qLmitD" +echo "https://linuxgsm.com" echo "=================================" echo "" echo "================================="