From fb014129abe50f1ddf664277814efc4df67c58d8 Mon Sep 17 00:00:00 2001 From: lijunlong Date: Mon, 24 Aug 2026 13:00:26 +0800 Subject: [PATCH 1/3] 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 6a91c3f..b258e75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ env: - JOBS=3 - NGX_BUILD_JOBS=$JOBS matrix: - - NGINX_VERSION=1.31.3 + - NGINX_VERSION=1.31.4 before_install: - sudo apt-get install -qq -y axel cpanminus libtest-base-perl libtext-diff-perl liburi-perl libwww-perl libtest-longstring-perl liblist-moreutils-perl ca-certificates > build.log 2>&1 || (cat build.log && exit 1) From 17014d1cfc9b877a8102e97be149d81aea453c44 Mon Sep 17 00:00:00 2001 From: lijunlong Date: Mon, 24 Aug 2026 13:35:05 +0800 Subject: [PATCH 2/3] ci: migrate Travis CI to GitHub Actions --- .github/workflows/ci.yml | 79 ++++++++++++++++++++++++++++++++++++++++ .travis.yml | 65 --------------------------------- 2 files changed, 79 insertions(+), 65 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..abe2900 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,79 @@ +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 \ + build-essential \ + ca-certificates \ + cpanminus \ + git \ + 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 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 + export JOBS=3 + export NGX_BUILD_JOBS=$JOBS + sudo apt-get install -qq -y axel cpanminus libtest-base-perl libtext-diff-perl liburi-perl libwww-perl libtest-longstring-perl liblist-moreutils-perl ca-certificates > build.log 2>&1 || (cat build.log && exit 1) + 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 + 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/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/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 + ldd `which nginx`|grep luajit + prove -I. -r t diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b258e75..0000000 --- a/.travis.yml +++ /dev/null @@ -1,65 +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 - - 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 - - JOBS=3 - - NGX_BUILD_JOBS=$JOBS - matrix: - - NGINX_VERSION=1.31.4 - -before_install: - - sudo apt-get install -qq -y axel cpanminus libtest-base-perl libtext-diff-perl liburi-perl libwww-perl libtest-longstring-perl liblist-moreutils-perl ca-certificates > build.log 2>&1 || (cat build.log && exit 1) - - 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: - - 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/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/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 - - ldd `which nginx`|grep luajit - - prove -I. -r t From d7517d5f3d81e030d2924f02d23d5eff8ba4db40 Mon Sep 17 00:00:00 2001 From: lijunlong Date: Mon, 24 Aug 2026 15:14:12 +0800 Subject: [PATCH 3/3] 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 abe2900..4c9e491 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: |