summaryrefslogtreecommitdiffstats
path: root/.drone.yml
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-11-21 22:28:17 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2019-11-27 13:34:41 +0100
commit4bed12e4d615379064799a39fe1b0928afd686ab (patch)
treec0fdcbf4ce3d96f0773a2aec90ddc25c96fcbca9 /.drone.yml
parentc007ca624f4a95e1a491221d425fcb2fa6e5589a (diff)
downloadnextcloud-server-4bed12e4d615379064799a39fe1b0928afd686ab.tar.gz
nextcloud-server-4bed12e4d615379064799a39fe1b0928afd686ab.zip
Update drone
* Run 7.4 tests (nodb + sqlite) * Update older images to newer phpunit Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to '.drone.yml')
-rw-r--r--.drone.yml65
1 files changed, 39 insertions, 26 deletions
diff --git a/.drone.yml b/.drone.yml
index 2f6dda41d56..4fbd4b015c6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -52,7 +52,7 @@ steps:
commands:
- git submodule update --init
- name: checkers
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- ./autotest-checkers.sh
secrets: [ github_token ]
@@ -94,17 +94,22 @@ steps:
commands:
- git submodule update --init
- name: syntax-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- composer install
- ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
- name: syntax-php7.3
- image: nextcloudci/php7.3:php7.3-1
+ image: nextcloudci/php7.3:php7.3-4
+ commands:
+ - composer install
+ - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
+- name: syntax-php7.4
+ image: nextcloudci/php7.4:2
commands:
- composer install
- ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
- name: phan
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- composer install
- composer require --dev "phan/phan:0.11.1"
@@ -323,11 +328,15 @@ steps:
commands:
- git submodule update --init
- name: nodb-php7.2
- image: nextcloudci/php7.2:php7.2-11
+ image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
- name: nodb-php7.3
- image: nextcloudci/php7.3:php7.3-1
+ image: nextcloudci/php7.3:php7.3-4
+ commands:
+ - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+- name: nodb-php7.4
+ image: nextcloudci/php7.4:2
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
@@ -353,11 +362,15 @@ steps:
commands:
- git submodule update --init
- name: sqlite-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
- name: sqlite-php7.3
- image: nextcloudci/php7.3:php7.3-1
+ image: nextcloudci/php7.3:php7.3-4
+ commands:
+ - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
+- name: sqlite-php7.4
+ image: nextcloudci/php7.4:2
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
@@ -383,7 +396,7 @@ steps:
commands:
- git submodule update --init
- name: mariadb10.1-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -418,7 +431,7 @@ steps:
commands:
- git submodule update --init
- name: mariadb10.2-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -452,7 +465,7 @@ steps:
commands:
- git submodule update --init
- name: mariadb10.3-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -486,7 +499,7 @@ steps:
commands:
- git submodule update --init
- name: mariadb10.4-php7.3
- image: nextcloudci/php7.3:php7.3-1
+ image: nextcloudci/php7.3:php7.3-4
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -521,7 +534,7 @@ steps:
commands:
- git submodule update --init
- name: mysql-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
@@ -557,7 +570,7 @@ steps:
commands:
- git submodule update --init
- name: mysql-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
@@ -589,7 +602,7 @@ steps:
commands:
- git submodule update --init
- name: mysql-php7.3
- image: nextcloudci/php7.3:php7.3-1
+ image: nextcloudci/php7.3:php7.3-4
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
@@ -621,7 +634,7 @@ steps:
commands:
- git submodule update --init
- name: mysql5.6-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
@@ -655,7 +668,7 @@ steps:
commands:
- git submodule update --init
- name: postgres-php7.3
- image: nextcloudci/php7.3:php7.3-1
+ image: nextcloudci/php7.3:php7.3-4
commands:
- sleep 10 # gives the database enough time to initialize
- POSTGRES=9 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
@@ -690,7 +703,7 @@ steps:
commands:
- git submodule update --init
- name: postgres-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- sleep 10 # gives the database enough time to initialize
- POSTGRES=10 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
@@ -724,7 +737,7 @@ steps:
commands:
- git submodule update --init
- name: postgres-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- sleep 10 # gives the database enough time to initialize
- POSTGRES=11 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
@@ -759,7 +772,7 @@ steps:
commands:
- git submodule update --init
- name: mysqlmb4-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
@@ -794,7 +807,7 @@ steps:
commands:
- git submodule update --init
- name: mysqlmb4-php7.3
- image: nextcloudci/php7.3:php7.3-1
+ image: nextcloudci/php7.3:php7.3-4
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
@@ -2041,7 +2054,7 @@ steps:
commands:
- git submodule update --init
- name: nodb-codecov
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- phpenmod xdebug
- TEST_SELECTION=NODB ./autotest.sh sqlite
@@ -2070,7 +2083,7 @@ steps:
commands:
- git submodule update --init
- name: db-codecov
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- phpenmod xdebug
- TEST_SELECTION=QUICKDB ./autotest.sh sqlite
@@ -2099,7 +2112,7 @@ steps:
commands:
- git submodule update --init
- name: object-store
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- phpenmod xdebug
- ./tests/drone-wait-objectstore.sh
@@ -2130,7 +2143,7 @@ steps:
commands:
- git submodule update --init
- name: object-store
- image: nextcloudci/php7.2:php7.2-12
+ image: nextcloudci/php7.2:php7.2-13
commands:
- phpenmod xdebug
- ./tests/drone-wait-objectstore.sh
@@ -2262,7 +2275,7 @@ trigger:
# commands:
# - git submodule update --init
#- name: memcache-redis-cluster
-# image: nextcloudci/php7.2:php7.2-12
+# image: nextcloudci/php7.2:php7.2-13
# commands:
# - phpenmod xdebug
# - sleep 20
ss="o">. self::$nameSpaceCache[$appId]; } $appInfo = \OC_App::getAppInfo($appId); if (isset($appInfo['namespace'])) { self::$nameSpaceCache[$appId] = trim($appInfo['namespace']); } else { if ($appId !== 'spreed') { // if the tag is not found, fall back to uppercasing the first letter self::$nameSpaceCache[$appId] = ucfirst($appId); } else { // For the Talk app (appid spreed) the above fallback doesn't work. // This leads to a problem when trying to install it freshly, // because the apps namespace is already registered before the // app is downloaded from the appstore, because of the hackish // global route index.php/call/{token} which is registered via // the core/routes.php so it does not have the app namespace. // @ref https://github.com/nextcloud/server/pull/19433 self::$nameSpaceCache[$appId] = 'Talk'; } } return $topNamespace . self::$nameSpaceCache[$appId]; } /** * Shortcut for calling a controller method and printing the result * @param string $controllerName the name of the controller under which it is * stored in the DI container * @param string $methodName the method that you want to call * @param DIContainer $container an instance of a pimple container. * @param array $urlParams list of URL parameters (optional) * @throws HintException */ public static function main(string $controllerName, string $methodName, DIContainer $container, array $urlParams = null) { if (!is_null($urlParams)) { $container->query(IRequest::class)->setUrlParameters($urlParams); } elseif (isset($container['urlParams']) && !is_null($container['urlParams'])) { $container->query(IRequest::class)->setUrlParameters($container['urlParams']); } $appName = $container['AppName']; // first try $controllerName then go for \OCA\AppName\Controller\$controllerName try { $controller = $container->query($controllerName); } catch(QueryException $e) { if (strpos($controllerName, '\\Controller\\') !== false) { // This is from a global registered app route that is not enabled. [/*OC(A)*/, $app, /* Controller/Name*/] = explode('\\', $controllerName, 3); throw new HintException('App ' . strtolower($app) . ' is not enabled'); } if ($appName === 'core') { $appNameSpace = 'OC\\Core'; } else { $appNameSpace = self::buildAppNamespace($appName); } $controllerName = $appNameSpace . '\\Controller\\' . $controllerName; $controller = $container->query($controllerName); } // initialize the dispatcher and run all the middleware before the controller /** @var Dispatcher $dispatcher */ $dispatcher = $container['Dispatcher']; list( $httpHeaders, $responseHeaders, $responseCookies, $output, $response ) = $dispatcher->dispatch($controller, $methodName); $io = $container[IOutput::class]; if(!is_null($httpHeaders)) { $io->setHeader($httpHeaders); } foreach($responseHeaders as $name => $value) { $io->setHeader($name . ': ' . $value); } foreach($responseCookies as $name => $value) { $expireDate = null; if($value['expireDate'] instanceof \DateTime) { $expireDate = $value['expireDate']->getTimestamp(); } $io->setCookie( $name, $value['value'], $expireDate, $container->getServer()->getWebRoot(), null, $container->getServer()->getRequest()->getServerProtocol() === 'https', true ); } /* * Status 204 does not have a body and no Content Length * Status 304 does not have a body and does not need a Content Length * https://tools.ietf.org/html/rfc7230#section-3.3 * https://tools.ietf.org/html/rfc7230#section-3.3.2 */ $emptyResponse = false; if (preg_match('/^HTTP\/\d\.\d (\d{3}) .*$/', $httpHeaders, $matches)) { $status = (int)$matches[1]; if ($status === Http::STATUS_NO_CONTENT || $status === Http::STATUS_NOT_MODIFIED) { $emptyResponse = true; } } if (!$emptyResponse) { if ($response instanceof ICallbackResponse) { $response->callback($io); } elseif (!is_null($output)) { $io->setHeader('Content-Length: ' . strlen($output)); $io->setOutput($output); } } } /** * Shortcut for calling a controller method and printing the result. * Similar to App:main except that no headers will be sent. * This should be used for example when registering sections via * \OC\AppFramework\Core\API::registerAdmin() * * @param string $controllerName the name of the controller under which it is * stored in the DI container * @param string $methodName the method that you want to call * @param array $urlParams an array with variables extracted from the routes * @param DIContainer $container an instance of a pimple container. */ public static function part(string $controllerName, string $methodName, array $urlParams, DIContainer $container) { $container['urlParams'] = $urlParams; $controller = $container[$controllerName]; $dispatcher = $container['Dispatcher']; list(, , $output) = $dispatcher->dispatch($controller, $methodName); return $output; } }