Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
(*) initial travis ci support
(*) removed "upstream keepalive module" since modern nginx supports that natively
(*) changed memcached regex
  • Loading branch information
chipitsine committed May 23, 2016
commit 410e7d76d21feffadf0f86ba6b2bb52d299a4a93
54 changes: 54 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
sudo: required
dist: trusty

os: linux

language: c

compiler:
- gcc
- clang

env:
global:
- LUAJIT_PREFIX=/opt/luajit21
- LUAJIT_LIB=$LUAJIT_PREFIX/lib
- LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH
- LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1
- LUA_INCLUDE_DIR=$LUAJIT_INC
- LUA_CMODULE_DIR=/lib
- JOBS=3
- NGX_BUILD_JOBS=$JOBS
matrix:
- NGINX_VERSION=1.9.15

services:
- memcache

before_install:
- sudo apt-get install -qq -y axel cpanminus libtest-base-perl libtext-diff-perl liburi-perl libwww-perl libtest-longstring-perl liblist-moreutils-perl > build.log 2>&1 || (cat build.log && exit 1)

install:
- git clone https://github.com/openresty/nginx-devel-utils.git
- git clone https://github.com/openresty/openresty.git ../openresty
- git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
- git clone https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module
- git clone https://github.com/openresty/test-nginx.git
- git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git
- git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module
- git clone https://github.com/openresty/nginx-eval-module.git ../eval-nginx-module
- git clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module
- git clone https://github.com/openresty/set-misc-nginx-module.git ../set-misc-nginx-module

script:
- cd luajit2
- make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT' > build.log 2>&1 || (cat build.log && exit 1)
- sudo make install PREFIX=$LUAJIT_PREFIX > build.log 2>&1 || (cat build.log && exit 1)
- cd ..
- cd test-nginx && sudo cpanm . && cd ..
- export PATH=$PWD/work/nginx/sbin:$PWD/nginx-devel-utils:$PATH
- export NGX_BUILD_CC=$CC
- sh util/build.sh $NGINX_VERSION > build.log 2>&1 || (cat build.log && exit 1)
- nginx -V
- ldd `which nginx`|grep luajit
- prove -r t
4 changes: 2 additions & 2 deletions t/cmd.t
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ ngx_memc: $memc_cmd variable not found for HTTP COPY requests
}
--- request
GET /allow
--- response_body_like: ^VERSION \d+(\.\d+)+\S*?\r\n$
--- response_body_like: ^VERSION \d+(\.\d+)+.*?\r\n$



Expand All @@ -82,7 +82,7 @@ ngx_memc: $memc_cmd variable not found for HTTP COPY requests
}
--- request
GET /allow
--- response_body_like: ^VERSION \d+(\.\d+)+\S*?\r\n$
--- response_body_like: ^VERSION \d+(\.\d+)+.*?\r\n$



Expand Down
2 changes: 1 addition & 1 deletion t/version.t
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ __DATA__
}
--- request
GET /ver
--- response_body_like: ^VERSION \d+(\.\d+)+\S*?\r\n$
--- response_body_like: ^VERSION \d+(\.\d+)+.*?\r\n$
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you make these changes a separate PR? I hope PRs are self-contained. Thank you very much!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chipitsine I can do the split myself this time. Please use atomic PRs next time. Thanks!


1 change: 0 additions & 1 deletion util/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ ngx-build $force $version \
--add-module=$root/../echo-nginx-module \
--add-module=$root/../set-misc-nginx-module \
--add-module=$root/../lua-nginx-module \
--add-module=$home/work/nginx/ngx_http_upstream_keepalive-0.7 \
--with-select_module \
--with-poll_module \
--with-debug
Expand Down