Skip to content

Commit

Permalink
travis: updated NGINX version to 1.13.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
dndx committed Aug 16, 2017
1 parent 1b73b4b commit 5cccec2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,15 @@ env:
- LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH
- LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1
- LUA_INCLUDE_DIR=$LUAJIT_INC
- PCRE_VER=8.33
- PCRE_VER=8.40
- PCRE_PREFIX=/opt/pcre
- PCRE_LIB=$PCRE_PREFIX/lib
- PCRE_INC=$PCRE_PREFIX/include
- JOBS=3
- NGX_BUILD_JOBS=$JOBS
- TEST_NGINX_SLEEP=0.006
matrix:
- NGINX_VERSION=1.9.15
- NGINX_VERSION=1.11.2
- NGINX_VERSION=1.13.3

services:
- memcache
Expand All @@ -44,7 +43,7 @@ install:
- if [ ! -f download-cache/pcre-$PCRE_VER.tar.gz ]; then wget -P download-cache/ http://ftp.cs.stanford.edu/pub/exim/pcre/pcre-$PCRE_VER.tar.gz; fi
- git clone https://github.com/openresty/nginx-devel-utils.git
- git clone https://github.com/openresty/lua-cjson.git
- git clone https://github.com/openresty/openresty.git ../openresty
- git clone -b 1.13.x 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/mockeagain.git
Expand All @@ -54,7 +53,6 @@ install:
- git clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module
- git clone https://github.com/openresty/memc-nginx-module.git ../memc-nginx-module
- git clone https://github.com/openresty/headers-more-nginx-module.git ../headers-more-nginx-module
- git clone https://github.com/openresty/stream-echo-nginx-module.git ../stream-echo-nginx-module

script:
- tar zxf download-cache/pcre-$PCRE_VER.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion util/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ home=~
#--add-module=$root/../stream-echo-nginx-module \
ngx-build $force $version \
--with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:/usr/local/lib" \
--with-cc-opt='-DNGX_LUA_NO_FFI_API' \
--with-cc-opt='-DNGX_LUA_USE_ASSERT' \
--with-http_stub_status_module \
--with-http_image_filter_module \
--without-mail_pop3_module \
Expand Down

0 comments on commit 5cccec2

Please sign in to comment.