CI/CircleCI: Switch to Ubuntu 20.04 and MySQL 8

This commit is contained in:
jackpoz
2020-05-31 14:53:13 +02:00
parent 8c09b6e58b
commit e3dfab52a6
2 changed files with 6 additions and 5 deletions

View File

@@ -2,8 +2,8 @@ version: 2
jobs:
pch_and_sql:
docker:
- image: trinitycore/circle-ci:3.3.5-buildpacks-disco
- image: circleci/mysql:5.7
- image: trinitycore/circle-ci:3.3.5-buildpacks-focal
- image: circleci/mysql:8
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: yes
MYSQL_ROOT_PASSWORD: ''
@@ -37,7 +37,6 @@ jobs:
./contrib/check_updates.sh characters 3.3.5 characters 127.0.0.1
mysql -h 127.0.0.1 -uroot world < sql/base/dev/world_database.sql
cat sql/updates/world/3.3.5/*.sql | mysql -h 127.0.0.1 -uroot world
mysql -h 127.0.0.1 -uroot < sql/create/drop_mysql.sql
- run:
name: Build
command: |
@@ -48,7 +47,7 @@ jobs:
./worldserver --version
nopch:
docker:
- image: trinitycore/circle-ci:3.3.5-buildpacks-disco
- image: trinitycore/circle-ci:3.3.5-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 utf8 COLLATE utf8_general_ci;