From e146919f9d642b7d28ef2e9d905fc394f04f19f8 Mon Sep 17 00:00:00 2001 From: gavin Date: Tue, 27 Oct 2020 13:57:05 +0530 Subject: [PATCH 1/2] chore: Added semantic config Installed https://github.com/zeke/semantic-pull-requests and added config for repo --- .github/semantic.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/semantic.yml diff --git a/.github/semantic.yml b/.github/semantic.yml new file mode 100644 index 00000000..e1e53bc1 --- /dev/null +++ b/.github/semantic.yml @@ -0,0 +1,13 @@ +# Always validate the PR title AND all the commits +titleAndCommits: true + +# Allow use of Merge commits (eg on github: "Merge branch 'master' into feature/ride-unicorns") +# this is only relevant when using commitsOnly: true (or titleAndCommits: true) +allowMergeCommits: true + +# Allow use of Revert commits (eg on github: "Revert "feat: ride unicorns"") +# this is only relevant when using commitsOnly: true (or titleAndCommits: true) +allowRevertCommits: true + +# For allowed PR types: https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json +# Tool Reference: https://github.com/zeke/semantic-pull-requests From f2e7702fdefe30ee8d0546da5dc09e9042f7f570 Mon Sep 17 00:00:00 2001 From: Adam Tang <37611541+adamtang79@users.noreply.github.com> Date: Wed, 28 Oct 2020 09:04:41 +0800 Subject: [PATCH 2/2] fix: utf8mb4_general_ci fix: prevent error while bench new-site --- bench/playbooks/roles/mariadb/tasks/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bench/playbooks/roles/mariadb/tasks/main.yml b/bench/playbooks/roles/mariadb/tasks/main.yml index 1f119005..8079583d 100644 --- a/bench/playbooks/roles/mariadb/tasks/main.yml +++ b/bench/playbooks/roles/mariadb/tasks/main.yml @@ -48,6 +48,10 @@ [mysqld] pid-file = /var/run/mysqld/mysqld.pid socket = /var/run/mysqld/mysqld.sock + + # setting appeared inside mysql but overwritten by mariadb inside mariadb.conf.d/xx-server.cnf valued as utf8mb4_general_ci + + collation-server = utf8mb4_unicode_ci create: yes become: yes become_user: root