From f712b464203f44f05dd12a654105e01f4f102ca5 Mon Sep 17 00:00:00 2001 From: Markolie Date: Tue, 21 Feb 2017 15:56:58 +0100 Subject: [PATCH] Fix Travis --- .travis.yml | 3 ++- _maps/test_away_missions.dm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2bbd62522e5..b79e72470f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ env: global: - BYOND_MAJOR="510" - BYOND_MINOR="1346" + - BYOND_MACRO_COUNT=2 matrix: - DM_MAPFILE="cyberiad" - DM_MAPFILE="metastation" @@ -29,7 +30,7 @@ before_script: - chmod +x ./install-byond.sh - ./install-byond.sh script: - - (num=`grep -E '\\\\(red|blue|green|black|italic|bold|b|i[^mc])' **/*.dm | wc -l`; echo "$num BYOND text macros (expecting 0)"; [ $num -eq 0 ]) + - (num=`grep -E '\\\\(red|blue|green|black|italic|bold|b|i[^mc])' **/*.dm | wc -l`; echo "$num BYOND text macros (expecting ${BYOND_MACRO_COUNT} or less)"; [ $num -le ${BYOND_MACRO_COUNT} ]) - source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup - bash dm.sh -M${DM_MAPFILE} paradise.dme diff --git a/_maps/test_away_missions.dm b/_maps/test_away_missions.dm index d6e14cf004e..e5c1f0d192e 100644 --- a/_maps/test_away_missions.dm +++ b/_maps/test_away_missions.dm @@ -6,7 +6,7 @@ #include "map_files\RandomZLevels\moonoutpost19.dmm" #include "map_files\RandomZLevels\undergroundoutpost45.dmm" #include "map_files\RandomZLevels\academy.dmm" - + #include "map_files\RandomZLevels\blackmarketpackers.dmm" #include "map_files\RandomZLevels\spacehotel.dmm" #include "map_files\RandomZLevels\stationCollision.dmm" #include "map_files\RandomZLevels\wildwest.dmm"