CI/CircleCI: Switch to Ubuntu 20.04 and MySQL 8

(cherry picked from commit e3dfab52a6)
This commit is contained in:
jackpoz
2020-05-31 14:53:13 +02:00
committed by funjoker
parent c981af6b31
commit 79250cb0df
2 changed files with 6 additions and 6 deletions

View File

@@ -2,8 +2,8 @@ version: 2
jobs:
pch_and_sql:
docker:
- image: trinitycore/circle-ci:master-buildpacks-disco
- image: circleci/mysql:5.7
- image: trinitycore/circle-ci:master-buildpacks-focal
- image: circleci/mysql:8
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: yes
MYSQL_ROOT_PASSWORD: ''
@@ -43,8 +43,6 @@ jobs:
cat sql/updates/world/master/*.sql | mysql -h 127.0.0.1 -uroot world
echo "Importing hotfixes database updates"
cat sql/updates/hotfixes/master/*.sql | mysql -h 127.0.0.1 -uroot hotfixes
echo "Dropping databases"
mysql -h 127.0.0.1 -uroot < sql/create/drop_mysql.sql
- run:
name: Build
command: |
@@ -55,7 +53,7 @@ jobs:
./worldserver --version
nopch:
docker:
- image: trinitycore/circle-ci:master-buildpacks-disco
- image: trinitycore/circle-ci:master-buildpacks-focal
steps:
- run:
name: Requirements

View File

@@ -1,4 +1,6 @@
GRANT USAGE ON * . * TO 'trinity'@'localhost' IDENTIFIED BY 'trinity' WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 ;
CREATE USER 'trinity'@'localhost' IDENTIFIED BY 'trinity' WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0;
GRANT USAGE ON * . * TO 'trinity'@'localhost';
CREATE DATABASE `world` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;