summaryrefslogtreecommitdiffstats
path: root/.drone.yml
diff options
context:
space:
mode:
Diffstat (limited to '.drone.yml')
-rw-r--r--.drone.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/.drone.yml b/.drone.yml
index c7c3764459c..7efea13dcaa 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,6 +19,13 @@ pipeline:
when:
matrix:
TESTS: check-autoloader
+ check-mergejs:
+ image: nextcloudci/php7.0:php7.0-7
+ commands:
+ - bash ./build/mergejschecker.sh
+ when:
+ matrix:
+ TESTS: check-mergejs
app-check-code:
image: nextcloudci/php7.0:php7.0-7
commands:
@@ -503,6 +510,7 @@ matrix:
- TESTS: integration-ldap-features
- TESTS: jsunit
- TESTS: check-autoloader
+ - TESTS: check-mergejs
- TESTS: app-check-code
- TESTS: syntax-php5.6
- TESTS: syntax-php7.0