From 277fac6e4f703ffc952584c08a9325377d11ff44 Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Mon, 10 Jun 2024 08:06:38 -0700 Subject: [PATCH] chore(deps) bump Nginx to 1.27.0 --- .github/workflows/ci-large.yml | 6 +++--- .github/workflows/ci.yml | 24 ++++++++++++------------ Makefile | 2 +- valgrind.suppress | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci-large.yml b/.github/workflows/ci-large.yml index a63d5f187..3fc7e3c10 100644 --- a/.github/workflows/ci-large.yml +++ b/.github/workflows/ci-large.yml @@ -24,7 +24,7 @@ jobs: os: [ubuntu-latest] #os: [ubuntu-latest, macos-latest] cc: [gcc-12] - ngx: [1.25.5] + ngx: [1.27.0] runtime: [wasmtime, wasmer, v8] wasmtime: [19.0.0] wasmer: [3.1.1] @@ -72,7 +72,7 @@ jobs: matrix: os: [ubuntu-22.04] cc: [gcc-12] - ngx: [1.25.5] + ngx: [1.27.0] runtime: [wasmer, wasmtime, v8] wasmtime: [19.0.0] wasmer: [3.1.1] @@ -155,7 +155,7 @@ jobs: label: [""] os: [ubuntu-latest] cc: [clang-13, clang-14, gcc-10, gcc-11] - ngx: [1.25.5] + ngx: [1.27.0] runtime: [wasmtime, wasmer, v8] wasmtime: [19.0.0] wasmer: [3.1.1] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c92ed185b..d90912a20 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.25.5] + ngx: [1.27.0] openresty: [""] runtime: [wasmer] wasmtime: [""] @@ -50,7 +50,7 @@ jobs: wasmtime: 19.0.0 os: ubuntu-latest cc: gcc-12 - ngx: 1.25.5 + ngx: 1.27.0 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.25.5 + ngx: 1.27.0 ipc: no_ipc ssl: ssl debug: debug @@ -80,7 +80,7 @@ jobs: - label: dynamic_nginx os: ubuntu-latest cc: gcc-12 - ngx: 1.25.5 + ngx: 1.27.0 runtime: wasmtime wasmtime: 19.0.0 ipc: no_ipc @@ -91,7 +91,7 @@ jobs: # No SSL - os: ubuntu-latest cc: gcc-12 - ngx: 1.25.5 + ngx: 1.27.0 runtime: wasmer wasmer: 3.1.1 ipc: no_ipc @@ -125,7 +125,7 @@ jobs: - label: ipc os: ubuntu-latest cc: gcc-12 - ngx: 1.25.5 + ngx: 1.27.0 runtime: wasmtime wasmtime: 19.0.0 ipc: ipc @@ -162,7 +162,7 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} parallel-finished: true - carryforward: 'unit-ngx_1.25.5-wasmer-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.25.5-wasmer-no_ipc-ssl-no_debug-no_hup-static,unit-ngx_1.25.5-wasmtime-no_ipc-ssl-debug-hup-static,unit-ngx_1.25.5-wasmtime-no_ipc-ssl-debug-hup-dynamic,unit-ngx_1.25.5-v8-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.21.6-wasmer-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.25.5-wasmer-no_ipc-no_ssl-no_debug-no_hup-static,unit-openresty_1.25.3.1-wasmtime-no_ipc-ssl-debug-no_hup-static,unit-openresty_1.25.3.1-wasmtime-no_ipc-ssl-debug-no_hup-dynamic,unit-ngx_1.25.5-wasmtime-ipc-no_ssl-debug-no_hup-static' + carryforward: 'unit-ngx_1.27.0-wasmer-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.0-wasmer-no_ipc-ssl-no_debug-no_hup-static,unit-ngx_1.27.0-wasmtime-no_ipc-ssl-debug-hup-static,unit-ngx_1.27.0-wasmtime-no_ipc-ssl-debug-hup-dynamic,unit-ngx_1.27.0-v8-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.21.6-wasmer-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.0-wasmer-no_ipc-no_ssl-no_debug-no_hup-static,unit-openresty_1.25.3.1-wasmtime-no_ipc-ssl-debug-no_hup-static,unit-openresty_1.25.3.1-wasmtime-no_ipc-ssl-debug-no_hup-dynamic,unit-ngx_1.27.0-wasmtime-ipc-no_ssl-debug-no_hup-static' valgrind: name: 'Valgrind' @@ -176,7 +176,7 @@ jobs: wasmer: [3.1.1] os: [ubuntu-22.04] cc: [gcc-12] - ngx: [1.25.5] + ngx: [1.27.0] openresty: [""] wasmtime: [""] v8: [""] @@ -189,7 +189,7 @@ jobs: wasmtime: 19.0.0 os: ubuntu-22.04 cc: gcc-12 - ngx: 1.25.5 + ngx: 1.27.0 hup: no_hup debug: debug path: t/01-wasm @@ -198,7 +198,7 @@ jobs: v8: 12.0.267.17 os: ubuntu-22.04 cc: gcc-12 - ngx: 1.25.5 + ngx: 1.27.0 debug: debug hup: no_hup path: t/01-wasm @@ -286,7 +286,7 @@ jobs: # No SSL - os: ubuntu-latest cc: clang-15 - ngx: 1.25.5 + ngx: 1.27.0 runtime: wasmer wasmer: 3.1.1 ssl: no_ssl @@ -327,7 +327,7 @@ jobs: matrix: os: [ubuntu-latest] cc: [clang-15, gcc-12] - ngx: [1.25.5] + ngx: [1.27.0] runtime: [wasmtime, wasmer, v8] wasmtime: [19.0.0] wasmer: [3.1.1] diff --git a/Makefile b/Makefile index 7d8fda725..072d48402 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -NGX ?= 1.25.5 +NGX ?= 1.27.0 OPENSSL ?= 3.3.1 WASMTIME ?= 19.0.0 WASMER ?= 3.1.1 diff --git a/valgrind.suppress b/valgrind.suppress index 8eb8ca1db..b660ea409 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