Merge pull request #30918

.travis.yml

@@ -1,7 +1,5 @@
 language: generic
 sudo: false
-dist: precise
-
 env:
     global:
     - BYOND_MAJOR="511"
@@ -23,12 +21,15 @@ cache:
 
 addons:
   apt:
+    sources:
+      - sourceline: 'ppa:ondrej/php'
     packages:
       - libc6-i386
       - libgcc1:i386
       - libstdc++6:i386
       - python
       - python-pip
+      - php5.6
 
 install:
   - tools/travis/install_build_tools.sh

tools/travis/before_build_byond.sh

@@ -5,6 +5,10 @@ set -e
 if [ "$BUILD_TOOLS" = true ]; then
   exit 0
 fi;
+echo "Combining maps for building"
+if [ "$DM_MAPFILE" = "loadallmaps" ]; then
+    python tools/travis/template_dm_generator.py
+fi;
 
 if [ -d "$HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin" ];
 then

tools/travis/before_build_tools.sh

@@ -5,6 +5,3 @@ if [ "$BUILD_TOOLS" = true ]; then
     cd tgui && source ~/.nvm/nvm.sh && npm install && cd ..
 fi;
 
-if [ "$DM_MAPFILE" = "loadallmaps" ]; then
-    python tools/travis/template_dm_generator.py
-fi;

tools/travis/build_tools.sh

@@ -7,5 +7,6 @@ if [ "$BUILD_TOOLS" = true ];
 then
     md5sum -c - <<< "49bc6b1b9ed56c83cceb6674bd97cb34 *html/changelogs/example.yml";
     cd tgui && source ~/.nvm/nvm.sh && gulp && cd ..;
+    php5.6 -l tools/WebhookProcessor/github_webhook_processor.php;
     python tools/ss13_genchangelog.py html/changelog.html html/changelogs;
 fi;