Skip to content

Commit 1641874

Browse files
authored
travis-ci: upgrade dist of travis-ci to ubuntu bionic. (#21)
tests: update encoding of MySQL server since MySQL is newer than 5.5.
1 parent 3fdea72 commit 1641874

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sudo: required
2-
dist: trusty
2+
dist: bionic
33

44
os: linux
55

@@ -25,7 +25,6 @@ cache:
2525

2626
compiler:
2727
- gcc
28-
- clang
2928

3029
env:
3130
global:
@@ -39,8 +38,8 @@ env:
3938
- NGX_BUILD_JOBS=$JOBS
4039
- TEST_NGINX_SLEEP=0.006
4140
matrix:
42-
- NGINX_VERSION=1.11.2
43-
- NGINX_VERSION=1.19.3
41+
- NGINX_VERSION=1.17.8
42+
- NGINX_VERSION=1.19.9
4443

4544
services:
4645
- mysql
@@ -69,6 +68,7 @@ install:
6968

7069
before_script:
7170
- mysql -uroot -e 'create database ngx_test; grant all on ngx_test.* to "ngx_test"@"%" identified by "ngx_test"; flush privileges;'
71+
- mysql -uroot -e 'alter database ngx_test character set utf8mb4 collate utf8mb4_unicode_ci;'
7272
- psql -c "create database ngx_test;" -U postgres
7373
- psql -c "create user ngx_test with password 'ngx_test';" -U postgres
7474
- psql -c "grant all privileges on database ngx_test to ngx_test;" -U postgres
@@ -85,4 +85,4 @@ script:
8585
- export NGX_BUILD_CC=$CC
8686
- sh util/build.sh $NGINX_VERSION > build.log 2>&1 || (cat build.log && exit 1)
8787
- nginx -V
88-
- prove -r t
88+
- prove -I. -r t

t/sanity.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ GET /test
332332
upstream backend {
333333
drizzle_server $TEST_NGINX_MYSQL_HOST:$TEST_NGINX_MYSQL_PORT protocol=mysql
334334
dbname=ngx_test user=ngx_test password=ngx_test
335-
charset=utf8;
335+
charset=utf8mb4;
336336
}
337337
338338
--- config
@@ -358,7 +358,7 @@ GET /test
358358
{"errcode":0}
359359
{"errcode":0}
360360
{"errcode":0,"insert_id":1,"affected_rows":1}
361-
[{"id":1,"body":"a\r\nb\b??\u001a"}]
361+
[{"id":1,"body":"a\r\nb\b你好\u001a"}]
362362
--- timeout: 5
363363
364364

0 commit comments

Comments
 (0)