Adjust travis-ci
This commit is contained in:
parent
e23c805627
commit
bbec3e2f20
15
.travis.yml
15
.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
|
||||
|
|
8
Makefile
8
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
|
||||
|
|
Loading…
Reference in New Issue