diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-03-24 12:49:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 12:49:57 +0300 |
| commit | f94bc6f8bb8d0b86441362c21d49304f31a02c0c (patch) | |
| tree | 443d4ea3091ef63c827bd243a5e720728b238a68 /.drone.yml | |
| parent | df4d1f7b78d54448061c6bc27c1aff4275c9cdf3 (diff) | |
| parent | 03d688d6acdaecdb59e04a8acef6d63edc174e37 (diff) | |
Merge pull request #4013 from nextcloud/bundle_vendor_js
Bundle vendor js
Diffstat (limited to '.drone.yml')
| -rw-r--r-- | .drone.yml | 8 |
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 |