From 0ff80462e3159f96fcb82a0401ebb7e13263310e Mon Sep 17 00:00:00 2001 From: lijunlong Date: Mon, 24 Aug 2026 12:53:22 +0800 Subject: [PATCH 1/4] 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 14d464b..efa28f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ env: - PCRE_LIB=$PCRE_PREFIX/lib - PCRE_INC=$PCRE_PREFIX/include matrix: - - NGINX_VERSION=1.31.3 + - NGINX_VERSION=1.31.4 before_install: - sudo apt-get install -y cpanminus wget From 16d5c0ea184d202e22443855b079d9818008b99f Mon Sep 17 00:00:00 2001 From: lijunlong Date: Mon, 24 Aug 2026 13:35:06 +0800 Subject: [PATCH 2/4] ci: migrate Travis CI to GitHub Actions --- .github/workflows/ci.yml | 85 ++++++++++++++++++++++++++++++++++++++++ .travis.yml | 76 ----------------------------------- 2 files changed, 85 insertions(+), 76 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..d94f182 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,85 @@ +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 \ + gdb \ + git \ + libgd-dev \ + libipc-run-perl \ + 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 JOBS=3 + export NGX_BUILD_JOBS=$JOBS + export LUAJIT_PREFIX=/opt/luajit21 + export LUAJIT_LIB=$LUAJIT_PREFIX/lib + export LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1 + export LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH + export TEST_NGINX_SLEEP=0.003 + export OPENSSL_PREFIX=/usr/local/openresty/openssl3 + export OPENSSL_LIB=$OPENSSL_PREFIX/lib + export OPENSSL_INC=$OPENSSL_PREFIX/include + export PCRE_PREFIX=/usr/local/openresty/pcre2 + export PCRE_LIB=$PCRE_PREFIX/lib + export PCRE_INC=$PCRE_PREFIX/include + sudo apt-get install -y cpanminus wget + cpanm --sudo --notest Test::Nginx IPC::Run Test2::Util > build.log 2>&1 || (cat build.log && exit 1) + sudo cpanm --notest Test::Base + wget -O - https://openresty.org/package/pubkey.gpg | sudo apt-key add - + echo "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/openresty.list + sudo apt-get update + sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends openresty-pcre2 openresty-openssl3 openresty-pcre2-dev openresty-openssl3-dev + if [ ! -d download-cache ]; then mkdir download-cache; fi + git clone https://github.com/openresty/openresty.git ../openresty + git clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core + git clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache + git clone https://github.com/openresty/nginx-devel-utils.git + git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module + git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx + git clone https://github.com/openresty/stream-lua-nginx-module.git ../stream-lua-nginx-module + git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git + cd luajit2/ + make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT -msse4.2' + sudo make install PREFIX=$LUAJIT_PREFIX + cd .. + export PATH=$PATH:`pwd`/nginx-devel-utils + ngx-build $NGINX_VERSION --with-ipv6 --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-http_realip_module --with-http_ssl_module --add-module=../lua-nginx-module --add-module=../stream-lua-nginx-module --with-debug --with-stream --with-stream_ssl_module + export PATH=$PATH:`pwd`/work/nginx/sbin + prove -I. -r t diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index efa28f1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,76 +0,0 @@ -sudo: required -dist: focal - -branches: - only: - - "master" - -os: linux - -language: c - -compiler: - - gcc - -addons: - apt: - packages: - - axel - - cpanminus - - libtest-base-perl - - libtext-diff-perl - - liburi-perl - - libwww-perl - - libtest-longstring-perl - - liblist-moreutils-perl - - libgd-dev - - libipc-run-perl - - gdb - -env: - global: - - JOBS=3 - - NGX_BUILD_JOBS=$JOBS - - LUAJIT_PREFIX=/opt/luajit21 - - LUAJIT_LIB=$LUAJIT_PREFIX/lib - - LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1 - - LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH - - TEST_NGINX_SLEEP=0.003 - - OPENSSL_PREFIX=/usr/local/openresty/openssl3 - - OPENSSL_LIB=$OPENSSL_PREFIX/lib - - OPENSSL_INC=$OPENSSL_PREFIX/include - - PCRE_PREFIX=/usr/local/openresty/pcre2 - - PCRE_LIB=$PCRE_PREFIX/lib - - PCRE_INC=$PCRE_PREFIX/include - matrix: - - NGINX_VERSION=1.31.4 - -before_install: - - sudo apt-get install -y cpanminus wget - - cpanm --sudo --notest Test::Nginx IPC::Run Test2::Util > build.log 2>&1 || (cat build.log && exit 1) - - sudo cpanm --notest Test::Base - - wget -O - https://openresty.org/package/pubkey.gpg | sudo apt-key add - - - echo "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/openresty.list - - sudo apt-get update - - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends openresty-pcre2 openresty-openssl3 openresty-pcre2-dev openresty-openssl3-dev - -install: - - if [ ! -d download-cache ]; then mkdir download-cache; fi - - git clone https://github.com/openresty/openresty.git ../openresty - - git clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core - - git clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache - - git clone https://github.com/openresty/nginx-devel-utils.git - - git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module - - git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx - - git clone https://github.com/openresty/stream-lua-nginx-module.git ../stream-lua-nginx-module - - git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git - -script: - - cd luajit2/ - - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT -msse4.2' - - sudo make install PREFIX=$LUAJIT_PREFIX - - cd .. - - export PATH=$PATH:`pwd`/nginx-devel-utils - - ngx-build $NGINX_VERSION --with-ipv6 --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-http_realip_module --with-http_ssl_module --add-module=../lua-nginx-module --add-module=../stream-lua-nginx-module --with-debug --with-stream --with-stream_ssl_module - - export PATH=$PATH:`pwd`/work/nginx/sbin - - prove -I. -r t From 9c30731d8278673b274774b3c5a1d7de17586d87 Mon Sep 17 00:00:00 2001 From: lijunlong Date: Mon, 24 Aug 2026 13:39:52 +0800 Subject: [PATCH 3/4] ci: adapt tests to GitHub runner --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d94f182..6251c5b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,5 +81,5 @@ jobs: cd .. export PATH=$PATH:`pwd`/nginx-devel-utils ngx-build $NGINX_VERSION --with-ipv6 --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-http_realip_module --with-http_ssl_module --add-module=../lua-nginx-module --add-module=../stream-lua-nginx-module --with-debug --with-stream --with-stream_ssl_module - export PATH=$PATH:`pwd`/work/nginx/sbin + export PATH=`pwd`/work/nginx/sbin:$PATH prove -I. -r t From df1472a1ebf58f8ff6f8e6aed4790734abc324c5 Mon Sep 17 00:00:00 2001 From: lijunlong Date: Mon, 24 Aug 2026 15:14:13 +0800 Subject: [PATCH 4/4] ci: update actions for Node.js 24 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6251c5b..bd682e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 + uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0 - name: Install system dependencies run: |