From 249a792eda4f3f42ce2b86c4553de58e66613461 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Tue, 19 Sep 2017 12:37:04 -0400 Subject: [PATCH] Throw on the libs from tgstation cause why not? --- .travis.yml | 7 +++++++ build_byond.sh | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2c726f4c1..b2a5107e62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,13 @@ cache: directories: - $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR} +addons: + apt: + packages: + - libc6-i386 + - libgcc1:i386 + - libstdc++6:i386 + install: - ./install_byond.sh diff --git a/build_byond.sh b/build_byond.sh index 51233964b2..ac4473ad9a 100755 --- a/build_byond.sh +++ b/build_byond.sh @@ -4,13 +4,9 @@ set -e retval=1 source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup -env -file $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/DreamMaker -env -if hash $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/DreamMaker 2>/dev/null +if hash DreamMaker 2>/dev/null then - env - $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/DreamMaker $DMEName 2>&1 | tee result.log + DreamMaker $DMEName 2>&1 | tee result.log retval=$? if ! grep '\- 0 errors, 0 warnings' result.log then