From 405863e8d1e62405aa99bc770692c502ba2f461a Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 2 Dec 2019 16:13:14 +0545 Subject: [PATCH] Run federated server only on PHP 7.2 to allow for core 10.2.1 --- .drone.star | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index b908f00d58c5..c816fbe96140 100644 --- a/.drone.star +++ b/.drone.star @@ -1309,6 +1309,7 @@ def acceptance(): 'includeKeyInMatrixName': False, 'runAllSuites': False, 'numberOfParts': 1, + 'federatedPhpVersion': '7.2', } if 'defaults' in config: @@ -1448,7 +1449,7 @@ def acceptance(): yarnInstall(phpVersion) + installServer(phpVersion, db, params['logLevel'], params['federatedServerNeeded'], params['proxyNeeded']) + ( - installFederated(federatedServerVersion, phpVersion, params['logLevel'], protocol, db, federationDbSuffix) + + installFederated(federatedServerVersion, params['federatedPhpVersion'], params['logLevel'], protocol, db, federationDbSuffix) + owncloudLog('federated', 'federated') if params['federatedServerNeeded'] else [] ) + installExtraApps(phpVersion, extraAppsDict) + @@ -1482,7 +1483,7 @@ def acceptance(): params['extraServices'] + owncloudService(phpVersion, 'server', '/drone/src', params['useHttps']) + (( - owncloudService(phpVersion, 'federated', '/drone/federated', params['useHttps']) + + owncloudService(params['federatedPhpVersion'], 'federated', '/drone/federated', params['useHttps']) + databaseServiceForFederation(db, federationDbSuffix) ) if params['federatedServerNeeded'] else []), 'depends_on': [],