From 3e3b120175b940625e1452a65996ffb20263e3cf Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Thu, 2 Mar 2017 11:12:22 +0100 Subject: [PATCH] Add js build and remove tests from travis Signed-off-by: Julius Haertl --- .drone.yml | 11 +++++++++++ .travis.yml | 7 ------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index c988d8794..2cf6418de 100644 --- a/.drone.yml +++ b/.drone.yml @@ -129,6 +129,16 @@ pipeline: when: matrix: 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: include: - TESTS: check-app-compatbility @@ -138,3 +148,4 @@ matrix: - TESTS: php5.6 - TESTS: php7.0 - TESTS: php7.1 + - TESTS: jsbuild diff --git a/.travis.yml b/.travis.yml index 865ba6b2b..997aa2998 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,7 @@ php: - 7 env: matrix: - - CORE_BRANCH=master DB=sqlite TEST_JS=1 - CORE_BRANCH=master DB=mysql - - CORE_BRANCH=stable11 DB=sqlite - CORE_BRANCH=stable11 DB=mysql before_install: @@ -16,7 +14,6 @@ before_install: - bash ./before_install.sh deck $CORE_BRANCH $DB - cd ../server - ./occ app:enable deck - - ./occ app:check-code deck - php -S localhost:8080 & before_script: @@ -24,11 +21,7 @@ before_script: - make install-deps script: - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ] && [ '$TEST_JS' = '1' ]; then make build-js; fi;" - make test after_failure: - cat ../../data/nextcloud.log - -after_success: - - bash <(curl -s https://codecov.io/bash)