From 3eb7eed5a37b2279256d3e88ef29d0d935264d47 Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Wed, 4 Dec 2024 09:56:02 -0800 Subject: [PATCH] chore(deps) bump Nginx to 1.27.3 --- .github/workflows/ci-large.yml | 12 ++++++------ .github/workflows/ci.yml | 26 +++++++++++++------------- Makefile | 2 +- valgrind.suppress | 6 +++--- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci-large.yml b/.github/workflows/ci-large.yml index 32a477aca..9fc7af241 100644 --- a/.github/workflows/ci-large.yml +++ b/.github/workflows/ci-large.yml @@ -23,7 +23,7 @@ jobs: label: [""] os: [ubuntu-latest] cc: [gcc-12] - ngx: [1.27.2] + ngx: [1.27.3] runtime: [wasmtime, wasmer, v8] wasmtime: [26.0.0] wasmer: [3.1.1] @@ -52,7 +52,7 @@ jobs: wasmer: 3.1.1 os: macos-13 cc: clang - ngx: 1.27.2 + ngx: 1.27.3 ssl: ssl debug: debug hup: no_hup @@ -62,7 +62,7 @@ jobs: wasmtime: 26.0.0 os: macos-13 cc: clang - ngx: 1.27.2 + ngx: 1.27.3 ssl: ssl debug: debug hup: hup @@ -72,7 +72,7 @@ jobs: v8: 12.0.267.17 os: macos-13 cc: clang - ngx: 1.27.2 + ngx: 1.27.3 ssl: ssl debug: debug hup: no_hup @@ -101,7 +101,7 @@ jobs: matrix: os: [ubuntu-22.04] cc: [gcc-12] - ngx: [1.27.2] + ngx: [1.27.3] runtime: [wasmer, wasmtime, v8] wasmtime: [26.0.0] wasmer: [3.1.1] @@ -169,7 +169,7 @@ jobs: label: [""] os: [ubuntu-latest] cc: [clang-13, clang-14, gcc-10, gcc-11] - ngx: [1.27.2] + ngx: [1.27.3] runtime: [wasmtime, wasmer, v8] wasmtime: [26.0.0] wasmer: [3.1.1] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c9cca1b8..d889395e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: label: [""] os: [ubuntu-latest] cc: [gcc-12] - ngx: [1.27.2] + ngx: [1.27.3] openresty: [""] runtime: [wasmer] wasmtime: [""] @@ -50,7 +50,7 @@ jobs: wasmtime: 26.0.0 os: ubuntu-latest cc: gcc-12 - ngx: 1.27.2 + ngx: 1.27.3 ipc: no_ipc ssl: ssl debug: debug @@ -60,7 +60,7 @@ jobs: v8: 12.0.267.17 os: ubuntu-latest cc: gcc-12 - ngx: 1.27.2 + ngx: 1.27.3 ipc: no_ipc ssl: ssl debug: debug @@ -70,7 +70,7 @@ jobs: wasmtime: 26.0.0 os: ubuntu-latest cc: gcc-12 - ngx: 1.27.2 + ngx: 1.27.3 ipc: no_ipc ssl: no_ssl debug: debug @@ -91,7 +91,7 @@ jobs: - label: dynamic_nginx os: ubuntu-latest cc: gcc-12 - ngx: 1.27.2 + ngx: 1.27.3 runtime: wasmtime wasmtime: 26.0.0 ipc: no_ipc @@ -102,7 +102,7 @@ jobs: # No SSL - os: ubuntu-latest cc: gcc-12 - ngx: 1.27.2 + ngx: 1.27.3 runtime: wasmer wasmer: 3.1.1 ipc: no_ipc @@ -136,7 +136,7 @@ jobs: - label: ipc os: ubuntu-latest cc: gcc-12 - ngx: 1.27.2 + ngx: 1.27.3 runtime: wasmtime wasmtime: 26.0.0 ipc: ipc @@ -174,7 +174,7 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} parallel-finished: true - carryforward: 'unit-ngx_1.27.2-wasmer-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.2-wasmer-no_ipc-ssl-no_debug-no_hup-static,unit-ngx_1.27.2-wasmtime-no_ipc-ssl-debug-hup-static,unit-ngx_1.27.2-wasmtime-no_ipc-ssl-debug-hup-dynamic,unit-ngx_1.27.2-v8-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.2-wasmtime-no_ipc-no_ssl-debug-no_hup-static-wasm32-unknown-unknown,unit-ngx_1.21.6-wasmer-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.2-wasmer-no_ipc-no_ssl-no_debug-no_hup-static,unit-openresty_1.27.1.1-wasmtime-no_ipc-ssl-debug-no_hup-static,unit-openresty_1.27.1.1-wasmtime-no_ipc-ssl-debug-no_hup-dynamic,unit-ngx_1.27.2-wasmtime-ipc-no_ssl-debug-no_hup-static' + carryforward: 'unit-ngx_1.27.3-wasmer-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.3-wasmer-no_ipc-ssl-no_debug-no_hup-static,unit-ngx_1.27.3-wasmtime-no_ipc-ssl-debug-hup-static,unit-ngx_1.27.3-wasmtime-no_ipc-ssl-debug-hup-dynamic,unit-ngx_1.27.3-v8-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.3-wasmtime-no_ipc-no_ssl-debug-no_hup-static-wasm32-unknown-unknown,unit-ngx_1.21.6-wasmer-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.3-wasmer-no_ipc-no_ssl-no_debug-no_hup-static,unit-openresty_1.27.1.1-wasmtime-no_ipc-ssl-debug-no_hup-static,unit-openresty_1.27.1.1-wasmtime-no_ipc-ssl-debug-no_hup-dynamic,unit-ngx_1.27.3-wasmtime-ipc-no_ssl-debug-no_hup-static' valgrind: name: 'Valgrind' @@ -188,7 +188,7 @@ jobs: wasmer: [3.1.1] os: [ubuntu-22.04] cc: [gcc-12] - ngx: [1.27.2] + ngx: [1.27.3] openresty: [""] wasmtime: [""] v8: [""] @@ -200,7 +200,7 @@ jobs: wasmtime: 26.0.0 os: ubuntu-22.04 cc: gcc-12 - ngx: 1.27.2 + ngx: 1.27.3 hup: no_hup debug: debug path: t/01-wasm @@ -209,7 +209,7 @@ jobs: v8: 12.0.267.17 os: ubuntu-22.04 cc: gcc-12 - ngx: 1.27.2 + ngx: 1.27.3 debug: debug hup: no_hup path: t/01-wasm @@ -297,7 +297,7 @@ jobs: # No SSL - os: ubuntu-latest cc: clang-15 - ngx: 1.27.2 + ngx: 1.27.3 runtime: wasmer wasmer: 3.1.1 ssl: no_ssl @@ -323,7 +323,7 @@ jobs: matrix: os: [ubuntu-latest] cc: [clang-15, gcc-12] - ngx: [1.27.2] + ngx: [1.27.3] runtime: [wasmtime, wasmer, v8] wasmtime: [26.0.0] wasmer: [3.1.1] diff --git a/Makefile b/Makefile index 5ae460193..87cae0961 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -NGX ?= 1.27.2 +NGX ?= 1.27.3 OPENSSL ?= 3.4.0 WASMTIME ?= 26.0.0 WASMER ?= 3.1.1 diff --git a/valgrind.suppress b/valgrind.suppress index 53fd9c16d..6c18f6a36 100644 --- a/valgrind.suppress +++ b/valgrind.suppress @@ -1,5 +1,5 @@ { - + Memcheck:Leak match-leak-kinds: definite fun:malloc @@ -7,14 +7,14 @@ fun:ngx_set_environment } { - + Memcheck:Leak fun:malloc fun:ngx_alloc fun:ngx_event_process_init } { - + Memcheck:Leak match-leak-kinds: possible fun:malloc