From e71ebf334da958f23b2a70cd92a8dd46f77bee12 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 16 Mar 2016 15:17:27 +0100 Subject: [PATCH 1/2] [stable9] Execute parallel-lint Backport of #22994 and #23303 --- .travis.yml | 9 +++++++++ composer.json | 6 ++++++ 2 files changed, 15 insertions(+) create mode 100644 composer.json diff --git a/.travis.yml b/.travis.yml index 0f6a027d061..529fd1c0975 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ install: 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/ .; fi" - sh -c "if [ '$TEST_DAV' != '1' ]; then echo \"Not testing DAV\"; fi" - sh -c "if [ '$TEST_DAV' = '1' ]; then echo \"Testing DAV\"; fi" @@ -42,5 +43,13 @@ matrix: env: DB=sqlite;TC=carddav - php: 5.4 env: DB=sqlite;TC=caldav + - php: 5.4 + env: DB=sqlite;TC=syntax + - php: 5.5 + env: DB=sqlite;TC=syntax + - php: 5.6 + env: DB=sqlite;TC=syntax + - php: 7.0 + env: DB=sqlite;TC=syntax fast_finish: true diff --git a/composer.json b/composer.json new file mode 100644 index 00000000000..754925d58a7 --- /dev/null +++ b/composer.json @@ -0,0 +1,6 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "^0.9.2", + "jakub-onderka/php-console-highlighter": "^0.3.2" + } +} From b8af6e703a68adcac163b1873e2602dcf9e8489a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 17 Mar 2016 08:58:03 +0100 Subject: [PATCH 2/2] Don't try to execute a dav syntax test --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 529fd1c0975..37af4ab02e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,12 +44,12 @@ matrix: - php: 5.4 env: DB=sqlite;TC=caldav - php: 5.4 - env: DB=sqlite;TC=syntax + env: DB=sqlite;TC=syntax;TEST_DAV=0 - php: 5.5 - env: DB=sqlite;TC=syntax + env: DB=sqlite;TC=syntax;TEST_DAV=0 - php: 5.6 - env: DB=sqlite;TC=syntax + env: DB=sqlite;TC=syntax;TEST_DAV=0 - php: 7.0 - env: DB=sqlite;TC=syntax + env: DB=sqlite;TC=syntax;TEST_DAV=0 fast_finish: true