Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coding standard 2.0.0 #206

Merged
merged 2 commits into from
Dec 16, 2019
Merged

Coding standard 2.0.0 #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ff897d
Update to latest drone starlark code
phil-davis Dec 16, 2019
e53f4c0
Implement coding-standard 2.0.0
phil-davis Dec 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .drone.starlark
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,10 +1201,7 @@ def installTestrunner(phpVersion, useBundledApp):
'rsync -aIX /tmp/testrunner /var/www/owncloud',
] + ([
'cp -r /var/www/owncloud/testrunner/apps/%s /var/www/owncloud/server/apps/' % config['app']
] if not useBundledApp else []) + [
'cd /var/www/owncloud/testrunner',
'make install-composer-deps'
]
] if not useBundledApp else [])
}]

def installExtraApps(phpVersion, extraApps):
Expand Down Expand Up @@ -1270,7 +1267,7 @@ def setupCeph(serviceParams):

createFirstBucket = serviceParams['createFirstBucket'] if 'createFirstBucket' in serviceParams else True
setupCommands = serviceParams['setupCommands'] if 'setupCommands' in serviceParams else [
'wait-for-it -t 120 ceph:80',
'wait-for-it -t 600 ceph:80',
'cd /var/www/owncloud/server/apps/files_primary_s3',
'cp tests/drone/ceph.config.php /var/www/owncloud/server/config',
'cd /var/www/owncloud/server',
Expand Down Expand Up @@ -1298,7 +1295,7 @@ def setupScality(serviceParams):
createFirstBucket = serviceParams['createFirstBucket'] if 'createFirstBucket' in serviceParams else True
createExtraBuckets = serviceParams['createExtraBuckets'] if 'createExtraBuckets' in serviceParams else False
setupCommands = serviceParams['setupCommands'] if 'setupCommands' in serviceParams else [
'wait-for-it -t 120 scality:8000',
'wait-for-it -t 600 scality:8000',
'cd /var/www/owncloud/server/apps/files_primary_s3',
'cp tests/drone/%s /var/www/owncloud/server/config' % configFile,
'cd /var/www/owncloud/server'
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/owncloud-codestyle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"owncloud/coding-standard": "^1.0"
"owncloud/coding-standard": "^2.0"
}
}