summaryrefslogtreecommitdiffstats
path: root/.drone.yml
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-03-22 17:01:54 +0100
committerGitHub <noreply@github.com>2017-03-22 17:01:54 +0100
commit4518a2892479e98e9fb49ef6e1c90f0c58a19337 (patch)
tree34709afa5bee9fb070130486b7e0c0972cd7457f /.drone.yml
parent0b5e1814bea3a2f14e8fc2551cfcfc61604462d9 (diff)
downloadnextcloud-server-4518a2892479e98e9fb49ef6e1c90f0c58a19337.tar.gz
nextcloud-server-4518a2892479e98e9fb49ef6e1c90f0c58a19337.zip
Revert "Bundle vendor js"
Diffstat (limited to '.drone.yml')
-rw-r--r--.drone.yml8
1 files changed, 0 insertions, 8 deletions
diff --git a/.drone.yml b/.drone.yml
index 5cfba60cd45..5d4ab2ca963 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,13 +19,6 @@ 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:
@@ -500,7 +493,6 @@ 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