diff options
| author | jackpoz <giacomopoz@gmail.com> | 2020-05-31 14:53:13 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2020-05-31 15:40:15 +0200 |
| commit | e3dfab52a639275ea130d279f4a6fe4312d34b06 (patch) | |
| tree | 02f54f506359af5046ffdb9a5288c1a8d62aacc3 | |
| parent | 8c09b6e58b0e4f33b7a8e376a28709e693cf2914 (diff) | |
CI/CircleCI: Switch to Ubuntu 20.04 and MySQL 8
| -rw-r--r-- | .circleci/config.yml | 7 | ||||
| -rw-r--r-- | sql/create/create_mysql.sql | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index cd0214245d6..1f4f0463cc6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 diff --git a/sql/create/create_mysql.sql b/sql/create/create_mysql.sql index e182e06168f..c7a1b12cc27 100644 --- a/sql/create/create_mysql.sql +++ b/sql/create/create_mysql.sql @@ -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; |