From 5e86d718fdd3fb8287ecd2abf79f291b253fde14 Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Tue, 21 Jul 2020 17:39:19 -0700 Subject: [PATCH] Let's try again with less failure --- .travis.yml | 1 - _build_dependencies.sh | 4 +++- tools/travis/build_tgui.sh | 10 ++++++++++ tools/travis/validate_files.sh | 2 ++ 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 tools/travis/build_tgui.sh diff --git a/.travis.yml b/.travis.yml index e8fc91b07e5..09cefa27b32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ #pretending we're C because otherwise ruby will initialize, even with "language: dm". language: c -dist: xenial env: global: diff --git a/_build_dependencies.sh b/_build_dependencies.sh index bc251f876ab..b33548a58a0 100644 --- a/_build_dependencies.sh +++ b/_build_dependencies.sh @@ -8,4 +8,6 @@ export PHP_VERSION=5.6 # Byond Major export BYOND_MAJOR=513 # Byond Minor -export BYOND_MINOR=1526 \ No newline at end of file +export BYOND_MINOR=1526 +# Macro Count +export MACRO_COUNT=4 \ No newline at end of file diff --git a/tools/travis/build_tgui.sh b/tools/travis/build_tgui.sh new file mode 100644 index 00000000000..ea75c01b4c4 --- /dev/null +++ b/tools/travis/build_tgui.sh @@ -0,0 +1,10 @@ +#!/bin/bash +set -euo pipefail + +source _build_dependencies.sh + +source ~/.nvm/nvm.sh +nvm use $NODE_VERSION +cd tgui +bin/tgui --ci +cd .. diff --git a/tools/travis/validate_files.sh b/tools/travis/validate_files.sh index 1b5a756903c..aad451c8689 100644 --- a/tools/travis/validate_files.sh +++ b/tools/travis/validate_files.sh @@ -1,5 +1,7 @@ #!/bin/bash +source _build_dependencies.sh + RED='\033[0;31m' NC='\033[0m' FAILED=0