chore: resolved conflicts
This commit is contained in:
2
.github/workflows/ui-tests.yml
vendored
2
.github/workflows/ui-tests.yml
vendored
@@ -24,7 +24,7 @@ jobs:
|
||||
|
||||
services:
|
||||
mariadb:
|
||||
image: mariadb:10.6
|
||||
image: mariadb:10.8
|
||||
env:
|
||||
MARIADB_ROOT_PASSWORD: 123
|
||||
ports:
|
||||
|
||||
@@ -2,7 +2,7 @@ version: "3.7"
|
||||
name: lms
|
||||
services:
|
||||
mariadb:
|
||||
image: mariadb:10.6
|
||||
image: mariadb:10.8
|
||||
command:
|
||||
- --character-set-server=utf8mb4
|
||||
- --collation-server=utf8mb4_unicode_ci
|
||||
|
||||
Reference in New Issue
Block a user