diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-09-14 10:37:39 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-14 10:37:39 +0300 |
commit | a0a382128f7b64409693f56c8d65d59b1e7f035f (patch) | |
tree | d8e4ca46821b1e479b8c42e8ed332cc213e14b5a | |
parent | c59e607d743bae78e5859792fbde386b2e28228b (diff) | |
parent | 5c3e1211d1493a332dcd5b6632e2568fee52af7b (diff) |
Merge pull request #1403 from nextcloud/stable9-backport-1399
[stable9] Move Travis tests to DroneCI
-rw-r--r-- | .drone.yml | 74 | ||||
-rw-r--r-- | .travis.yml | 55 | ||||
-rw-r--r-- | apps/dav/tests/travis/litmus-v1/install.sh | 12 | ||||
-rw-r--r-- | apps/dav/tests/travis/litmus-v2/install.sh | 12 |
4 files changed, 74 insertions, 79 deletions
diff --git a/.drone.yml b/.drone.yml index ababd675c7f..1f19f74f87c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,6 +9,72 @@ pipeline: when: matrix: TESTS: jsunit + syntax-php5.4: + image: nextcloudci/php5.4:1.0.14 + commands: + - composer install + - vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude vendor/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php . + when: + matrix: + TESTS: syntax-php5.4 + syntax-php5.5: + image: nextcloudci/php5.5:1.0.14 + commands: + - composer install + - vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude vendor/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php . + when: + matrix: + TESTS: syntax-php5.5 + syntax-php5.6: + image: nextcloudci/php5.6:php5.6-2 + commands: + - composer install + - vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude vendor/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php . + when: + matrix: + TESTS: syntax-php5.6 + syntax-php7.0: + image: nextcloudci/php7.0:php7.0-2 + commands: + - composer install + - vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude vendor/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php . + when: + matrix: + TESTS: syntax-php7.0 + litmus-v1: + image: nextcloudci/litmus-php7.0:litmus-php7.0-2 + commands: + - bash tests/travis/install.sh sqlite + - bash apps/dav/tests/travis/litmus-v1/script.sh + when: + matrix: + TESTS: litmus-v1 + litmus-v2: + image: nextcloudci/litmus-php7.0:litmus-php7.0-2 + commands: + - bash tests/travis/install.sh sqlite + - bash apps/dav/tests/travis/litmus-v2/script.sh + when: + matrix: + TESTS: litmus-v2 + caldavtester: + image: nextcloudci/litmus-php7.0:litmus-php7.0-2 + commands: + - bash tests/travis/install.sh sqlite + - bash apps/dav/tests/travis/caldav/install.sh + - bash apps/dav/tests/travis/caldav/script.sh + when: + matrix: + TESTS: caldavtester + carddavtester: + image: nextcloudci/litmus-php7.0:litmus-php7.0-2 + commands: + - bash tests/travis/install.sh sqlite + - bash apps/dav/tests/travis/carddav/install.sh + - bash apps/dav/tests/travis/carddav/script.sh + when: + matrix: + TESTS: carddavtester sqlite-php5.4: image: nextcloudci/php5.4:1.0.7 commands: @@ -59,6 +125,14 @@ matrix: include: - TESTS: integration - TESTS: jsunit + - TESTS: syntax-php5.4 + - TESTS: syntax-php5.5 + - TESTS: syntax-php5.6 + - TESTS: syntax-php7.0 + - TESTS: litmus-v1 + - TESTS: litmus-v2 + - TESTS: caldavtester + - TESTS: carddavtester - DB: sqlite PHP: 5.4 - DB: sqlite diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index eafa7ed8393..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,55 +0,0 @@ -sudo: false -language: php -php: - - 5.4 - -env: - global: - - TEST_DAV=$(tests/travis/changed_app.sh dav) - - TC=litmus-v2 - matrix: - - DB=sqlite - -branches: - only: - - master - - /^stable\d+(\.\d+)?$/ - -addons: - apt: - packages: - - realpath - -before_install: - - sh -c "if [ '$TEST_DAV' = '1' ]; then bash tests/travis/before_install.sh $DB; fi" - -install: - - sh -c "if [ '$TEST_DAV' = '1' ]; then bash tests/travis/install.sh $DB; fi" - - sh -c "if [ '$TEST_DAV' = '1' ]; then bash apps/dav/tests/travis/$TC/install.sh; fi" - - -script: - - sh -c "if [ '$TC' = 'syntax' ]; then composer install && vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude vendor/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .; fi" - - sh -c "if [ '$TEST_DAV' != '1' ]; then echo \"Not testing DAV\"; fi" - - sh -c "if [ '$TEST_DAV' = '1' ]; then echo \"Testing DAV\"; fi" - - - sh -c "if [ '$TEST_DAV' = '1' ]; then bash apps/dav/tests/travis/$TC/script.sh; fi" - -matrix: - include: - - php: 5.4 - env: DB=pgsql;TC=litmus-v1 - - php: 5.4 - env: DB=sqlite;TC=carddav - - php: 5.4 - env: DB=sqlite;TC=caldav - - php: 5.4 - env: DB=sqlite;TC=syntax;TEST_DAV=0 - - php: 5.5 - env: DB=sqlite;TC=syntax;TEST_DAV=0 - - php: 5.6 - env: DB=sqlite;TC=syntax;TEST_DAV=0 - - php: 7.0 - env: DB=sqlite;TC=syntax;TEST_DAV=0 - - fast_finish: true diff --git a/apps/dav/tests/travis/litmus-v1/install.sh b/apps/dav/tests/travis/litmus-v1/install.sh deleted file mode 100644 index 0ee2cb08d82..00000000000 --- a/apps/dav/tests/travis/litmus-v1/install.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# compile litmus -if [ ! -f /tmp/litmus/litmus-0.13.tar.gz ]; then - mkdir -p /tmp/litmus - wget -O /tmp/litmus/litmus-0.13.tar.gz http://www.webdav.org/neon/litmus/litmus-0.13.tar.gz - cd /tmp/litmus - tar -xzf litmus-0.13.tar.gz - cd /tmp/litmus/litmus-0.13 - ./configure - make -fi diff --git a/apps/dav/tests/travis/litmus-v2/install.sh b/apps/dav/tests/travis/litmus-v2/install.sh deleted file mode 100644 index 0ee2cb08d82..00000000000 --- a/apps/dav/tests/travis/litmus-v2/install.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# compile litmus -if [ ! -f /tmp/litmus/litmus-0.13.tar.gz ]; then - mkdir -p /tmp/litmus - wget -O /tmp/litmus/litmus-0.13.tar.gz http://www.webdav.org/neon/litmus/litmus-0.13.tar.gz - cd /tmp/litmus - tar -xzf litmus-0.13.tar.gz - cd /tmp/litmus/litmus-0.13 - ./configure - make -fi |