Skip to content

Commit 2c7f065

Browse files
chipitsineagentzh
authored andcommitted
travis-ci: several improvements
(*) move package management under "apt" plugin (*) use nginx-1.11.2 instead of 1.10.X (*) use util/build.sh
1 parent 9175789 commit 2c7f065

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

.travis.yml

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,43 @@ compiler:
99
- gcc
1010
- clang
1111

12+
addons:
13+
apt:
14+
packages:
15+
- axel
16+
- cpanminus
17+
- libluajit-5.1-dev
18+
- libgd-dev
19+
- libpcre3-dev
20+
21+
cache:
22+
apt: true
23+
1224
env:
1325
global:
1426
- LUAJIT_LIB=/usr/lib64/libluajit-5.1.so
1527
- LUAJIT_INC=/usr/include/luajit-2.0
1628
- LUA_INCLUDE_DIR=/usr/include/luajit-2.0
1729
- LUA_CMODULE_DIR=/lib
1830
matrix:
19-
- NGINX_VERSION=1.10.0
31+
- NGINX_VERSION=1.11.2
2032
- NGINX_VERSION=1.9.15
2133

2234
before_install:
23-
- sudo apt-get install -qq -y cpanminus libluajit-5.1-dev libgd-dev libpcre3-dev
2435
- sudo cpanm --notest Test::Nginx > build.log 2>&1 || (cat build.log && exit 1)
2536

2637
install:
27-
- wget http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
28-
- git clone https://github.com/openresty/lua-nginx-module.git
29-
- git clone https://github.com/openresty/echo-nginx-module.git
30-
- git clone https://github.com/simpl/ngx_devel_kit.git
38+
- git clone https://github.com/openresty/openresty.git ../openresty
39+
- git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
40+
- git clone https://github.com/openresty/nginx-devel-utils.git
41+
- git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module
42+
- git clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module
43+
- git clone https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module
3144
- git clone https://github.com/openresty/sregex.git
3245

3346
script:
3447
- cd sregex && sudo make PREFIX=/usr install && cd ..
35-
- tar xzf nginx-${NGINX_VERSION}.tar.gz
36-
- cd nginx-${NGINX_VERSION}/
37-
- ./configure --with-debug --with-pcre --with-pcre-jit --with-ipv6 --with-poll_module --add-module=.. --add-module=../lua-nginx-module --add-module=../echo-nginx-module > build.log 2>&1 || (cat build.log && exit 1)
38-
- make -j2 > build.log 2>&1 || (cat build.log && exit 1)
39-
- export PATH=$PATH:`pwd`/objs
40-
- cd ..
48+
- export PATH=$PWD/work/nginx/sbin:$PWD/nginx-devel-utils:$PATH
49+
- sh util/build.sh $NGINX_VERSION > build.log 2>&1 || (cat build.log && exit 1)
4150
- nginx -V
42-
- prove -lv t
51+
- prove -r t

0 commit comments

Comments
 (0)