Adjust travis-ci

This commit is contained in:
Raimund Schlüßler 2019-01-26 22:05:11 +01:00
parent e23c805627
commit bbec3e2f20
No known key found for this signature in database
GPG Key ID: 036FA7EB1A599178
2 changed files with 13 additions and 10 deletions

View File

@ -1,9 +1,9 @@
dist: trusty
language: php language: php
php: php:
- 5.4 - 7.0
- 5.5 - 7.1
- 5.6 - 7.2
- hhvm
branches: branches:
only: only:
@ -11,11 +11,8 @@ branches:
- /^stable\d+(\.\d+)?$/ - /^stable\d+(\.\d+)?$/
script: script:
# Test lint - make
- sh -c "ant test" - make test
matrix: matrix:
allow_failures:
- php: hhvm
fast_finish: true fast_finish: true

View File

@ -59,7 +59,7 @@ ifneq ("$(wildcard $(private_key))","") #(,$(wildcard $(private_key)))
endif endif
endif endif
all: build all: install build
# Fetches the PHP and JS dependencies and compiles the JS. If no composer.json # 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 # is present, the composer step is skipped, if no package.json or js/package.json
@ -69,6 +69,12 @@ build:
$(npm) run build $(npm) run build
# Sets up the development environment # Sets up the development environment
.PHONY: install
install:
$(npm) install
$(npm) update
# Runs the development build
.PHONY: development .PHONY: development
development: development:
$(npm) install $(npm) install