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

Drop PHP 7.1 #148

Merged
merged 2 commits into from
Apr 18, 2020
Merged

Drop PHP 7.1 #148

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
c600367
Bump bamarni/composer-bin-plugin to 1.4
phil-davis Apr 18, 2020
2a609e3
Drop PHP 7.1 from CI
phil-davis Apr 18, 2020
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
39 changes: 22 additions & 17 deletions .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ config = {
'phpunit': {
'allDatabases' : {
'phpVersions': [
'7.1',
'7.2',
]
},
'reducedDatabases' : {
'phpVersions': [
'7.2',
'7.3',
],
'databases': [
Expand Down Expand Up @@ -76,7 +75,7 @@ def codestyle():
return pipelines

default = {
'phpVersions': ['7.1'],
'phpVersions': ['7.2'],
}

if 'defaults' in config:
Expand Down Expand Up @@ -265,7 +264,7 @@ def phan():
return pipelines

default = {
'phpVersions': ['7.1', '7.2', '7.3'],
'phpVersions': ['7.2', '7.3'],
}

if 'defaults' in config:
Expand Down Expand Up @@ -337,7 +336,7 @@ def build():
return pipelines

default = {
'phpVersions': ['7.1'],
'phpVersions': ['7.2'],
'commands': [
'make dist'
],
Expand Down Expand Up @@ -432,6 +431,7 @@ def javascript():
'extraServices': [],
'extraEnvironment': {},
'extraCommandsBeforeTestRun': [],
'extraTeardown': [],
}

if 'defaults' in config:
Expand Down Expand Up @@ -462,20 +462,20 @@ def javascript():
},
'steps':
installCore('daily-master-qa', 'sqlite', False) +
installApp('7.1') +
setupServerAndApp('7.1', params['logLevel']) +
installApp('7.2') +
setupServerAndApp('7.2', params['logLevel']) +
params['extraSetup'] +
[
{
'name': 'js-tests',
'image': 'owncloudci/php:7.1',
'image': 'owncloudci/php:7.2',
'pull': 'always',
'environment': params['extraEnvironment'],
'commands': params['extraCommandsBeforeTestRun'] + [
'make test-js'
]
}
],
] + params['extraTeardown'],
'services': params['extraServices'],
'depends_on': [],
'trigger': {
Expand Down Expand Up @@ -515,7 +515,7 @@ def phptests(testType):
errorFound = False

default = {
'phpVersions': ['7.1', '7.2', '7.3'],
'phpVersions': ['7.2', '7.3'],
'databases': [
'sqlite', 'mariadb:10.2', 'mysql:5.5', 'mysql:5.7', 'postgres:9.4', 'oracle'
],
Expand All @@ -529,6 +529,7 @@ def phptests(testType):
'extraEnvironment': {},
'extraCommandsBeforeTestRun': [],
'extraApps': {},
'extraTeardown': [],
}

if 'defaults' in config:
Expand Down Expand Up @@ -627,7 +628,7 @@ def phptests(testType):
command
]
}
],
] + params['extraTeardown'],
'services':
databaseService(db) +
cephService(params['cephS3']) +
Expand Down Expand Up @@ -682,7 +683,7 @@ def acceptance():
default = {
'servers': ['daily-master-qa', 'latest'],
'browsers': ['chrome'],
'phpVersions': ['7.1'],
'phpVersions': ['7.2'],
'databases': ['mariadb:10.2'],
'federatedServerNeeded': False,
'filterTags': '',
Expand All @@ -695,6 +696,7 @@ def acceptance():
'xForwardedFor': False,
'extraSetup': [],
'extraServices': [],
'extraTeardown': [],
'extraEnvironment': {},
'extraCommandsBeforeTestRun': [],
'extraApps': {},
Expand Down Expand Up @@ -855,7 +857,7 @@ def acceptance():
'make %s' % makeParameter
]
}),
],
] + params['extraTeardown'],
'services':
databaseService(db) +
browserService(browser) +
Expand Down Expand Up @@ -1103,16 +1105,18 @@ def getDbName(db):
def getDbUsername(db):
name = getDbName(db)

# The Oracle image has the Db Username hardcoded
if name == 'oracle':
return 'system'
return 'autotest'

return 'owncloud'

def getDbPassword(db):
name = getDbName(db)

# The Oracle image has the Db Password hardcoded
if name == 'oracle':
return 'oracle'
return 'owncloud'

return 'owncloud'

Expand All @@ -1122,6 +1126,7 @@ def getDbRootPassword():
def getDbDatabase(db):
name = getDbName(db)

# The Oracle image has the Db Name hardcoded
if name == 'oracle':
return 'XE'

Expand Down Expand Up @@ -1249,7 +1254,7 @@ def setupCeph(serviceParams):

return [{
'name': 'setup-ceph',
'image': 'owncloudci/php:7.1',
'image': 'owncloudci/php:7.2',
'pull': 'always',
'commands': setupCommands + ([
'./apps/files_primary_s3/tests/drone/create-bucket.sh',
Expand Down Expand Up @@ -1277,7 +1282,7 @@ def setupScality(serviceParams):

return [{
'name': 'setup-scality',
'image': 'owncloudci/php:7.1',
'image': 'owncloudci/php:7.2',
'pull': 'always',
'commands': setupCommands + ([
'php occ s3:create-bucket owncloud --accept-warning'
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"require": {
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.2"
"bamarni/composer-bin-plugin": "^1.4"
},
"extra": {
"bamarni-bin": {
Expand Down
33 changes: 20 additions & 13 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.