diff options
| author | jackpoz <giacomopoz@gmail.com> | 2020-05-31 14:53:13 +0200 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2022-01-02 21:29:32 +0100 |
| commit | 79250cb0df11c7ba6f7b3b482deea89eb3f93190 (patch) | |
| tree | 6d5bcc9898b81ff348806edcb357fbe558f7dcaf | |
| parent | c981af6b3106a7319960866ea012670cfa789915 (diff) | |
CI/CircleCI: Switch to Ubuntu 20.04 and MySQL 8
(cherry picked from commit e3dfab52a639275ea130d279f4a6fe4312d34b06)
| -rw-r--r-- | .circleci/config.yml | 8 | ||||
| -rw-r--r-- | sql/create/create_mysql.sql | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 0f6ef6f0ac2..16eb6cbf519 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 diff --git a/sql/create/create_mysql.sql b/sql/create/create_mysql.sql index f9c230b6ced..6dd3da0f50c 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 utf8mb4 COLLATE utf8mb4_unicode_ci; |