From aeb7c623d3e5e305c74c08ff91a3155fca17c9ae Mon Sep 17 00:00:00 2001 From: lijunlong Date: Mon, 24 Aug 2026 13:14:56 +0800 Subject: [PATCH 1/2] tests: update nginx to 1.31.4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d4d85e3..c248e7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ env: - NGX_BUILD_JOBS=$JOBS - TEST_NGINX_SLEEP=0.006 matrix: - - NGINX_VERSION=1.31.3 + - NGINX_VERSION=1.31.4 addons: apt: From 8a3a881c809ce8d0d6beab638705e3d5ad1fc35b Mon Sep 17 00:00:00 2001 From: lijunlong Date: Mon, 24 Aug 2026 13:35:05 +0800 Subject: [PATCH 2/2] ci: migrate Travis CI to GitHub Actions --- .github/workflows/ci.yml | 74 ++++++++++++++++++++++++++++++++++++++++ .travis.yml | 68 ------------------------------------ 2 files changed, 74 insertions(+), 68 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..7e163d4 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,74 @@ +name: CI + +on: + push: + branches: [master] + pull_request: + branches: [master] + +permissions: + contents: read + +jobs: + test: + name: nginx 1.31.4 + runs-on: ubuntu-22.04 + timeout-minutes: 45 + + steps: + - name: Checkout + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 + + - name: Install system dependencies + run: | + sudo apt-get update + sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + axel \ + build-essential \ + ca-certificates \ + cpanminus \ + git \ + libgd-dev \ + liblist-moreutils-perl \ + libtest-base-perl \ + libtest-longstring-perl \ + libtext-diff-perl \ + liburi-perl \ + libwww-perl \ + wget + + - name: Build and test + env: + CC: gcc + NGINX_VERSION: 1.31.4 + run: | + set -e + mkdir -p download-cache + export LUAJIT_PREFIX=/opt/luajit21 + export LUAJIT_LIB=$LUAJIT_PREFIX/lib + export LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH + export LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1 + export LUA_INCLUDE_DIR=$LUAJIT_INC + export LUA_CMODULE_DIR=/lib + export JOBS=3 + export NGX_BUILD_JOBS=$JOBS + export TEST_NGINX_SLEEP=0.006 + 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/openresty/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/echo-nginx-module.git ../echo-nginx-module + git clone https://github.com/openresty/set-misc-nginx-module.git ../set-misc-nginx-module + 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) + cpanm --sudo --notest Test::Nginx IPC::Run Test2::Util > build.log 2>&1 || (cat build.log && exit 1) + cd ../test-nginx && sudo cpanm . && cd .. + 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 + prove -I. -r t diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c248e7c..0000000 --- a/.travis.yml +++ /dev/null @@ -1,68 +0,0 @@ -sudo: required -dist: focal - -branches: - only: - - "master" - -os: linux - -language: c - -compiler: - - gcc - -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 - - TEST_NGINX_SLEEP=0.006 - matrix: - - NGINX_VERSION=1.31.4 - -addons: - apt: - packages: - - axel - - cpanminus - - libtest-base-perl - - libtext-diff-perl - - liburi-perl - - libwww-perl - - libtest-longstring-perl - - liblist-moreutils-perl - - libgd-dev - -cache: - apt: true - directories: - - download-cache - -install: - - 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/openresty/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/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) - - cpanm --sudo --notest Test::Nginx IPC::Run Test2::Util > build.log 2>&1 || (cat build.log && exit 1) - - cd ../test-nginx && sudo cpanm . && cd .. - - 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 - - prove -I. -r t