From 603fbd70f46c3ef5df8ca07e15cfe715e505162a Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 13 Sep 2016 10:57:27 +0200 Subject: [PATCH] Update drone.yml layout * add matrix * improve cline speed --- .drone.yml | 55 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1fa353c6d2..ababd675c7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,46 +1,74 @@ -build: +pipeline: + clone: + image: plugins/git + depth: 1 jsunit: image: nextcloudci/jsunit:1.0.6 commands: - ./autotest-js.sh + when: + matrix: + TESTS: jsunit sqlite-php5.4: image: nextcloudci/php5.4:1.0.7 commands: - - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - - git submodule update --init - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - NOCOVERAGE=true ./autotest.sh sqlite + when: + matrix: + DB: sqlite + PHP: 5.4 sqlite-php5.5: image: nextcloudci/php5.5:1.0.7 commands: - - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - - git submodule update --init - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - NOCOVERAGE=true ./autotest.sh sqlite + when: + matrix: + DB: sqlite + PHP: 5.5 sqlite: image: nextcloudci/php5.6:1.0.6 commands: - - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - - git submodule update --init - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - ./autotest.sh sqlite + when: + matrix: + DB: sqlite + PHP: 5.6 postgres: image: nextcloudci/php5.6:1.0.6 commands: - sleep 10 # gives the database enough time to initialize - - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - - git submodule update --init - ./autotest.sh pgsql + when: + matrix: + DB: postgres + PHP: 5.6 integration: image: nextcloudci/php5.6:1.0.6 commands: - - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - - git submodule update --init - ./occ maintenance:install --admin-pass=admin - cd build/integration - ./run.sh + when: + matrix: + TESTS: integration -compose: +matrix: + include: + - TESTS: integration + - TESTS: jsunit + - DB: sqlite + PHP: 5.4 + - DB: sqlite + PHP: 5.5 + - DB: sqlite + PHP: 5.6 + - DB: postgres + PHP: 5.6 + +services: cache: image: redis postgres: @@ -48,3 +76,6 @@ compose: environment: - POSTGRES_USER=oc_autotest - POSTGRES_PASSWORD=oc_autotest + when: + matrix: + DB: postgres