From c23143bde442840c79b509592d35e643d7e85422 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Fri, 4 Dec 2020 13:10:32 +0100 Subject: [PATCH] #1079 MariaDB 10.4 --- .travis.yml | 9 ++++----- test/ci/mysql.yml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f7228ba0..4bbe4471 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,13 +23,14 @@ language: ruby sudo: true -dist: xenial +dist: focal rvm: - 2.6 -before_install: +before_script: - sudo mysql -e 'CREATE DATABASE IF NOT EXISTS test CHARACTER SET utf8mb4;' + - sudo mysql -e "GRANT ALL PRIVILEGES ON test.* TO 'travis'@'%';"; - psql -c 'create database test;' -U postgres - export WORKSPACE=`pwd`/workspace - export PATH_TO_DMSF=`pwd` @@ -40,8 +41,6 @@ before_install: - bash -x ./test/ci/redmine_install.sh -c - bash -x ./test/ci/redmine_install.sh -i -install: - script: - bash -x ./test/ci/redmine_install.sh -t @@ -63,4 +62,4 @@ services: - postgresql addons: - mariadb: '10.4' + mariadb: '10.5' diff --git a/test/ci/mysql.yml b/test/ci/mysql.yml index 01381c93..148d8a9f 100644 --- a/test/ci/mysql.yml +++ b/test/ci/mysql.yml @@ -2,6 +2,6 @@ test: adapter: mysql2 database: test - username: root + username: travis encoding: utf8mb4 collation: utf8mb4_unicode_ci \ No newline at end of file