Skip to content

Commit

Permalink
Run federated server only on PHP 7.2 to allow for core 10.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
phil-davis authored and VicDeo committed Apr 23, 2020
1 parent b269c98 commit 540b0cc
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -1316,6 +1316,7 @@ def acceptance():
'includeKeyInMatrixName': False,
'runAllSuites': False,
'numberOfParts': 1,
'federatedPhpVersion': '7.2',
}

if 'defaults' in config:
Expand Down Expand Up @@ -1455,7 +1456,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) +
Expand Down Expand Up @@ -1489,7 +1490,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': [],
Expand Down

0 comments on commit 540b0cc

Please sign in to comment.