Skip to content

Commit 9134bcd

Browse files
feature: add support for nginx-1.29.2.
1 parent a9addfa commit 9134bcd

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ env:
2828
- LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH
2929
- LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1
3030
- LUA_INCLUDE_DIR=$LUAJIT_INC
31-
- PCRE2_VER=10.45
32-
#- PCRE2_PREFIX=/opt/pcre2
33-
- PCRE2_PREFIX=/usr/local/openresty/pcre2
31+
- PCRE2_VER=10.46
32+
- PCRE2_PREFIX=/opt/pcre2
33+
#- PCRE2_PREFIX=/usr/local/openresty/pcre2
3434
- PCRE2_LIB=$PCRE2_PREFIX/lib
3535
- PCRE2_INC=$PCRE2_PREFIX/include
36-
#- OPENSSL_PREFIX=/opt/ssl3
37-
- OPENSSL_PREFIX=/usr/local/openresty/openssl3
36+
- OPENSSL_PREFIX=/opt/ssl3
37+
#- OPENSSL_PREFIX=/usr/local/openresty/openssl3
3838
- OPENSSL_LIB=$OPENSSL_PREFIX/lib
3939
- OPENSSL_INC=$OPENSSL_PREFIX/include
4040
- JOBS=3
4141
- NGX_BUILD_JOBS=$JOBS
4242
- TEST_NGINX_SLEEP=0.006
4343
matrix:
44-
- NGINX_VERSION=1.27.1 OPENSSL_VER=3.5.0
44+
- NGINX_VERSION=1.29.2 OPENSSL_VER=3.5.4
4545

4646
services:
4747
- memcache
@@ -54,8 +54,8 @@ before_install:
5454
- sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends openresty-pcre2 openresty-openssl3 openresty-pcre2-dev openresty-openssl3-dev
5555

5656
install:
57-
#- if [ ! -f download-cache/pcre2-$PCRE2_VER.tar.gz ]; then wget -P download-cache https://downloads.sourceforge.net/project/pcre/pcre2/${PCRE2_VER}/pcre2-${PCRE2_VER}.tar.gz; fi
58-
#- if [ ! -f download-cache/openssl-$OPENSSL_VER.tar.gz ]; then wget -P download-cache https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz; fi
57+
- if [ ! -f download-cache/pcre2-$PCRE2_VER.tar.gz ]; then wget -P download-cache https://downloads.sourceforge.net/project/pcre/pcre2/${PCRE2_VER}/pcre2-${PCRE2_VER}.tar.gz; fi
58+
- if [ ! -f download-cache/openssl-$OPENSSL_VER.tar.gz ]; then wget -P download-cache https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz; fi
5959
- git clone https://github.com/openresty/openresty-devel-utils.git
6060
- git clone https://github.com/openresty/lua-cjson.git
6161
- git clone https://github.com/openresty/openresty.git ../openresty
@@ -78,14 +78,14 @@ script:
7878
- sudo ip addr add 10.254.254.1/24 dev lo
7979
- sudo ip addr add 10.254.254.2/24 dev lo
8080
- sudo ip route add prohibit 0.0.0.1/32
81-
#- tar zxf download-cache/pcre2-$PCRE2_VER.tar.gz; cd pcre2-$PCRE2_VER/; ./configure --prefix=$PCRE2_PREFIX --enable-jit --enable-utf > build.log 2>&1 || (cat build.log && exit 1); make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1); sudo PATH=$PATH make install > build.log 2>&1 || (cat build.log && exit 1); cd ..;
81+
- tar zxf download-cache/pcre2-$PCRE2_VER.tar.gz; cd pcre2-$PCRE2_VER/; ./configure --prefix=$PCRE2_PREFIX --enable-jit --enable-utf > build.log 2>&1 || (cat build.log && exit 1); make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1); sudo PATH=$PATH make install > build.log 2>&1 || (cat build.log && exit 1); cd ..;
8282
- cd luajit2
8383
- 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)
8484
- sudo make install PREFIX=$LUAJIT_PREFIX > build.log 2>&1 || (cat build.log && exit 1)
8585
- cd ../test-nginx && sudo cpanm . && cd ..
8686
- cd lua-cjson/ && make -j$JOBS && sudo make install && cd ..
8787
- cd mockeagain/ && make CC=$CC -j$JOBS && cd ..
88-
#- tar zxf download-cache/openssl-$OPENSSL_VER.tar.gz; cd openssl-$OPENSSL_VER/; ./config no-threads shared enable-ssl3 enable-ssl3-method -g --prefix=$OPENSSL_PREFIX -DPURIFY > build.log 2>&1 || (cat build.log && exit 1); make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1); sudo make PATH=$PATH install_sw > build.log 2>&1 || (cat build.log && exit 1) ; cd ..
88+
- tar zxf download-cache/openssl-$OPENSSL_VER.tar.gz; cd openssl-$OPENSSL_VER/; ./config no-threads shared enable-ssl3 enable-ssl3-method -g --prefix=$OPENSSL_PREFIX -DPURIFY > build.log 2>&1 || (cat build.log && exit 1); make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1); sudo make PATH=$PATH install_sw > build.log 2>&1 || (cat build.log && exit 1) ; cd ..
8989
- export PATH=$PWD/work/nginx/sbin:$PWD/openresty-devel-utils:$PATH
9090
- export NGX_BUILD_CC=$CC
9191
- sh util/build.sh $NGINX_VERSION > build.log 2>&1 || (cat build.log && exit 1)

t/138-balancer.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ retry counter: 5
237237
238238
--- error_log
239239
set more tries: reduced tries due to limit
240+
--- ONLY
240241
241242
242243

0 commit comments

Comments
 (0)