ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into select-first-color

Browse Source
This commit is contained in:
Julius Härtl
2017-02-02 18:33:00 +01:00
committed by GitHub
parent b6d057a284 8375108412
commit 54c6d669f5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -6,7 +6,7 @@ php:
- 7 - 7
env: env:
matrix: matrix:
- CORE_BRANCH=master DB=sqlite - CORE_BRANCH=master DB=sqlite TEST_JS=1
- CORE_BRANCH=master DB=mysql - CORE_BRANCH=master DB=mysql
- CORE_BRANCH=stable11 DB=sqlite - CORE_BRANCH=stable11 DB=sqlite
- CORE_BRANCH=stable11 DB=mysql - CORE_BRANCH=stable11 DB=mysql
@@ -24,9 +24,7 @@ before_script:
- make install-deps - make install-deps
script: script:
- node --version - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ] && [ '$TEST_JS' = '1' ]; then make build-js; fi;"
- npm --version
- make build-js
- make test - make test
after_failure: after_failure: