From 8ff6fade58372939f54ceaab54694dfed880df0e Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Fri, 29 Jan 2016 09:02:53 +0100 Subject: [PATCH 1/2] Makes Travis treat build warnings as errors. The DM build script now outputs the build log to a file which can then be reviewed from .travis.yml. --- .travis.yml | 1 + scripts/dm.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1a444a51a87..70c9167707d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,7 @@ script: - source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup - cp config/example/* config/ - scripts/dm.sh -DUNIT_TEST baystation12.dme + - grep "0 warnings" build_log.txt - DreamDaemon baystation12.dmb -invisible -trusted -core 2>&1 | tee log.txt - grep "All Unit Tests Passed" log.txt - (! grep "runtime error:" log.txt) diff --git a/scripts/dm.sh b/scripts/dm.sh index e8985cdfc8c..dda127e27e8 100755 --- a/scripts/dm.sh +++ b/scripts/dm.sh @@ -44,7 +44,7 @@ if [[ $DM == "" ]]; then exit 3 fi -"$DM" $dmepath.mdme +"$DM" $dmepath.mdme > build_log.txt retval=$? mv $dmepath.mdme.dmb $dmepath.dmb From f623add60bc98a856a21d1c5d1e81fbb24b44b35 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Fri, 29 Jan 2016 09:12:45 +0100 Subject: [PATCH 2/2] Corrects the cause of the warning. --- .../modular_computers/computers/item/modular_computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/modular_computers/computers/item/modular_computer.dm b/code/modules/modular_computers/computers/item/modular_computer.dm index 42eaa788915..30f76d518bf 100644 --- a/code/modules/modular_computers/computers/item/modular_computer.dm +++ b/code/modules/modular_computers/computers/item/modular_computer.dm @@ -616,4 +616,4 @@ ui_updated_needed = 1 if(ui_updated_needed) - update_uis \ No newline at end of file + update_uis()