From 9ad63a225ae9c9a696c818e5e35ff10529b3d1df Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Tue, 16 Feb 2021 09:45:30 +0545
Subject: [PATCH 1/2] Apply latest drone starlark code

---
 .drone.star | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.drone.star b/.drone.star
index 748a8cc..c2ba995 100644
--- a/.drone.star
+++ b/.drone.star
@@ -196,7 +196,7 @@ def jscodestyle():
 		'steps': [
 			{
 				'name': 'coding-standard-js',
-				'image': 'owncloudci/php:7.2',
+				'image': 'owncloudci/php:8.0',
 				'pull': 'always',
 				'commands': [
 					'make test-js-style'
@@ -501,13 +501,13 @@ def javascript(ctx):
 		},
 		'steps':
 			installCore('daily-master-qa', 'sqlite', False) +
-			installApp('7.2') +
-			setupServerAndApp('7.2', params['logLevel']) +
+			installApp('7.4') +
+			setupServerAndApp('7.4', params['logLevel']) +
 			params['extraSetup'] +
 		[
 			{
 				'name': 'js-tests',
-				'image': 'owncloudci/php:7.2',
+				'image': 'owncloudci/php:8.0',
 				'pull': 'always',
 				'environment': params['extraEnvironment'],
 				'commands': params['extraCommandsBeforeTestRun'] + [
@@ -1591,7 +1591,7 @@ def databaseServiceForFederation(db, suffix):
 		print('Not implemented federated database for ', dbName)
 		return []
 
-	return [{
+	service = {
 		'name': dbName + suffix,
 		'image': db,
 		'pull': 'always',
@@ -1601,7 +1601,10 @@ def databaseServiceForFederation(db, suffix):
 			'MYSQL_DATABASE': getDbDatabase(db) + suffix,
 			'MYSQL_ROOT_PASSWORD': getDbRootPassword()
 		}
-	}]
+	}
+	if (db == 'mysql:8.0'):
+		service['command'] = ['--default-authentication-plugin=mysql_native_password']
+	return [service]
 
 def buildTestConfig(params):
 	configs = []

From ced52ad2713b60f9fbee34d3eb3c0b27feb53649 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Tue, 16 Feb 2021 09:45:53 +0545
Subject: [PATCH 2/2] Test with mysql 8.0

---
 .drone.star | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.star b/.drone.star
index c2ba995..e92ff0b 100644
--- a/.drone.star
+++ b/.drone.star
@@ -31,7 +31,7 @@ config = {
 				'7.4',
 			],
 			'databases': [
-				'mysql:5.5',
+				'mysql:8.0',
 			],
 			'coverage': False
 		},