Commit 1641874

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 1641874Copy full SHA for 1641874

File tree

-7

lines changed

-7

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`sudo: required`
`2`		`-dist: trusty`
	`2`	`+dist: bionic`
`3`	`3`
`4`	`4`	`os: linux`
`5`	`5`
`@@ -25,7 +25,6 @@ cache:`
`25`	`25`
`26`	`26`	`compiler:`
`27`	`27`	`- gcc`
`28`		`- - clang`
`29`	`28`
`30`	`29`	`env:`
`31`	`30`	`global:`
`@@ -39,8 +38,8 @@ env:`
`39`	`38`	`- NGX_BUILD_JOBS=$JOBS`
`40`	`39`	`- TEST_NGINX_SLEEP=0.006`
`41`	`40`	`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`
`44`	`43`
`45`	`44`	`services:`
`46`	`45`	`- mysql`
`@@ -69,6 +68,7 @@ install:`
`69`	`68`
`70`	`69`	`before_script:`
`71`	`70`	`- 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;'`
`72`	`72`	`- psql -c "create database ngx_test;" -U postgres`
`73`	`73`	`- psql -c "create user ngx_test with password 'ngx_test';" -U postgres`
`74`	`74`	`- psql -c "grant all privileges on database ngx_test to ngx_test;" -U postgres`
`@@ -85,4 +85,4 @@ script:`
`85`	`85`	`- export NGX_BUILD_CC=$CC`
`86`	`86`	`- sh util/build.sh $NGINX_VERSION > build.log 2>&1 \|\| (cat build.log && exit 1)`
`87`	`87`	`- nginx -V`
`88`		`- - prove -r t`
	`88`	`+ - prove -I. -r t`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ GET /test`
`332`	`332`	`upstream backend {`
`333`	`333`	`drizzle_server $TEST_NGINX_MYSQL_HOST:$TEST_NGINX_MYSQL_PORT protocol=mysql`
`334`	`334`	`dbname=ngx_test user=ngx_test password=ngx_test`
`335`		`- charset=utf8;`
	`335`	`+ charset=utf8mb4;`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`--- config`
`@@ -358,7 +358,7 @@ GET /test`
`358`	`358`	`{"errcode":0}`
`359`	`359`	`{"errcode":0}`
`360`	`360`	`{"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"}]`
`362`	`362`	`--- timeout: 5`
`363`	`363`
`364`	`364`

Comments

(0)