From bbec3e2f20db5deafcc415209d9f24c8bca06048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?=
 <raimund.schluessler@mailbox.org>
Date: Sat, 26 Jan 2019 22:05:11 +0100
Subject: [PATCH] Adjust travis-ci

---
 .travis.yml | 15 ++++++---------
 Makefile    |  8 +++++++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a39b52fb..a91a398f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
+dist: trusty
 language: php
 php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
+  - 7.0
+  - 7.1
+  - 7.2
 
 branches:
   only:
@@ -11,11 +11,8 @@ branches:
     - /^stable\d+(\.\d+)?$/
 
 script:
-  # Test lint
-  - sh -c "ant test"
-
+  - make
+  - make test
 
 matrix:
-  allow_failures:
-    - php: hhvm
   fast_finish: true
diff --git a/Makefile b/Makefile
index ab915600..538ce148 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ ifneq ("$(wildcard $(private_key))","") #(,$(wildcard $(private_key)))
 	endif
 endif
 
-all: build
+all: install build
 
 # Fetches the PHP and JS dependencies and compiles the JS. If no composer.json
 # is present, the composer step is skipped, if no package.json or js/package.json
@@ -69,6 +69,12 @@ build:
 	$(npm) run build
 
 # Sets up the development environment
+.PHONY: install
+install:
+	$(npm) install
+	$(npm) update
+
+# Runs the development build
 .PHONY: development
 development:
 	$(npm) install