From 45d08bff8b68201ed22cc161a418446b180ebac6 Mon Sep 17 00:00:00 2001 From: lijunlong Date: Fri, 17 Nov 2023 22:48:29 +0800 Subject: [PATCH 1/2] tests: update nginx to 1.25.3. --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad6de7d..2ae3759 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: required -dist: bionic +dist: focal os: linux @@ -20,8 +20,8 @@ env: - NGX_BUILD_JOBS=$JOBS - TEST_NGINX_SLEEP=0.006 matrix: - - NGINX_VERSION=1.17.8 - - NGINX_VERSION=1.19.9 + - NGINX_VERSION=1.21.4 + - NGINX_VERSION=1.25.3 addons: apt: @@ -42,7 +42,7 @@ cache: - download-cache install: - - git clone https://github.com/openresty/nginx-devel-utils.git + - git clone https://github.com/openresty/openresty-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 @@ -57,7 +57,7 @@ script: - 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 ../test-nginx && sudo cpanm . && cd .. - - export PATH=$PWD/work/nginx/sbin:$PWD/nginx-devel-utils:$PATH + - export PATH=$PWD/work/nginx/sbin:$PWD/openresty-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 From 1df16933d56474ed3a27702770af8f7997cf2421 Mon Sep 17 00:00:00 2001 From: lijunlong Date: Thu, 23 Nov 2023 12:05:19 +0800 Subject: [PATCH 2/2] more fixes. --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ae3759..676b2c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,10 @@ sudo: required dist: focal +branches: + only: + - "master" + os: linux language: c @@ -20,8 +24,8 @@ env: - NGX_BUILD_JOBS=$JOBS - TEST_NGINX_SLEEP=0.006 matrix: - - NGINX_VERSION=1.21.4 - NGINX_VERSION=1.25.3 + #- NGINX_VERSION=1.21.4 addons: apt: