diff --git a/.travis.yml b/.travis.yml index 08a46cf6b5d..a34e0e29f9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ env: - DM_MAPFILE="" matrix: - BUILD_TOOLS=true - - DM_MAPFILE="templates" - DM_MAPFILE="loadallmaps" cache: diff --git a/_maps/loadallmaps.dm b/_maps/loadallmaps.dm index 1cf574249ec..b9192f88f3c 100644 --- a/_maps/loadallmaps.dm +++ b/_maps/loadallmaps.dm @@ -44,6 +44,10 @@ #undef TRAVIS_MASS_MAP_BUILD +#ifdef TRAVISBUILDING +#include "templates.dm" +#endif + #include "runtimestation.dm" #define BYOND_WHY_YOU_NO_ALLOW_INCLUDE_LAST_LINE //because byond fails to compile if the last thing in a file is an include. \ No newline at end of file diff --git a/tools/travis/before_build_tools.sh b/tools/travis/before_build_tools.sh index 89fc61bfb9d..50167e1262a 100755 --- a/tools/travis/before_build_tools.sh +++ b/tools/travis/before_build_tools.sh @@ -5,6 +5,6 @@ if [ "$BUILD_TOOLS" = true ]; then cd tgui && source ~/.nvm/nvm.sh && npm install && cd .. fi; -if [ "$DM_MAPFILE" = "templates" ]; then +if [ "$DM_MAPFILE" = "loadallmaps" ]; then python tools/travis/template_dm_generator.py fi; diff --git a/tools/travis/build_byond.sh b/tools/travis/build_byond.sh index c4828e74cd6..e5f35adfaa2 100755 --- a/tools/travis/build_byond.sh +++ b/tools/travis/build_byond.sh @@ -7,5 +7,5 @@ shopt -s globstar if [ "$BUILD_TOOLS" = false ]; then (! grep 'step_[xy]' _maps/**/*.dmm) source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup - tools/travis/dm.sh -M${DM_MAPFILE} tgstation.dme + tools/travis/dm.sh -DTRAVISBUILDING -M${DM_MAPFILE} tgstation.dme fi;