Skip to content

Commit 5b3c955

Browse files
authored
Merge pull request liangliangyy#293 from liangliangyy/dev
fix liangliangyy#291
2 parents 2824b71 + 95abed7 commit 5b3c955

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

.travis.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1+
dist: xenial
12
language: python
3+
sudo: required
24
python:
35
- "3.5"
46
- "3.6"
5-
matrix:
6-
include:
7-
- python: "3.7"
8-
dist: xenial
9-
allow_failures:
10-
- python: "3.7"
7+
- "3.7"
8+
119
services:
1210
- mysql
1311
env:
@@ -20,12 +18,14 @@ branches:
2018
before_install:
2119
- sudo apt-get update
2220
- sudo apt-get install python-dev python3-dev libmysqlclient-dev
21+
- sudo cp $TRAVIS_BUILD_DIR/travis_test/mysql.cnf /etc/mysql/conf.d/
22+
- sudo service mysql restart
2323
install:
2424
- pip install -r travis_test/requirements.txt
2525
- pip install python-coveralls
2626
- pip install coverage codecov
2727
before_script:
28-
- mysql -e 'CREATE DATABASE `djangoblog` /*!40100 DEFAULT CHARACTER SET utf8 */;'
28+
- mysql -e 'CREATE DATABASE `djangoblog` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;'
2929
- python manage.py makemigrations
3030
- python manage.py migrate
3131
- python manage.py collectstatic --noinput

travis_test/mysql.cnf

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[mysqld]
2+
character-set-server=utf8mb4
3+
collation-server=utf8mb4_unicode_ci
4+
5+
[client]
6+
default-character-set = utf8mb4
7+
8+
[mysql]
9+
default-character-set = utf8mb4

0 commit comments

Comments
 (0)