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

Add js build and remove tests from travis

Browse Source 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
This commit is contained in:
Julius Haertl
2017-03-02 11:12:22 +01:00
parent cf03e08d1e
commit 3e3b120175
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.drone.yml
View File

@@ -129,6 +129,16 @@ pipeline:
when: when:
matrix: matrix:
TESTS: php7.1 TESTS: php7.1
jsbuild:
image: mhart/alpine-node:6.8.0
commands:
- apk add --no-cache git
- cd js
- npm install --deps
- ./node_modules/.bin/bower --allow-root install
when:
matrix:
TESTS: jsbuild
matrix: matrix:
include: include:
- TESTS: check-app-compatbility - TESTS: check-app-compatbility
@@ -138,3 +148,4 @@ matrix:
- TESTS: php5.6 - TESTS: php5.6
- TESTS: php7.0 - TESTS: php7.0
- TESTS: php7.1 - TESTS: php7.1
- TESTS: jsbuild

7
.travis.yml
View File

@@ -6,9 +6,7 @@ php:
- 7 - 7
env: env:
matrix: matrix:
- 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=mysql - CORE_BRANCH=stable11 DB=mysql
before_install: before_install:
@@ -16,7 +14,6 @@ before_install:
- bash ./before_install.sh deck $CORE_BRANCH $DB - bash ./before_install.sh deck $CORE_BRANCH $DB
- cd ../server - cd ../server
- ./occ app:enable deck - ./occ app:enable deck
- ./occ app:check-code deck
- php -S localhost:8080 & - php -S localhost:8080 &
before_script: before_script:
@@ -24,11 +21,7 @@ before_script:
- make install-deps - make install-deps
script: script:
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ] && [ '$TEST_JS' = '1' ]; then make build-js; fi;"
- make test - make test
after_failure: after_failure:
- cat ../../data/nextcloud.log - cat ../../data/nextcloud.log
after_success:
- bash <(curl -s https://codecov.io/bash)