From 3cf7537f54cd7096d28cf53f556543a6452bf073 Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Thu, 26 Oct 2023 10:08:29 -0700 Subject: [PATCH] chore(deps) bump Nginx to 1.25.3 --- .github/workflows/ci-large.yml | 6 +++--- .github/workflows/ci.yml | 22 +++++++++++----------- Makefile | 2 +- valgrind.suppress | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci-large.yml b/.github/workflows/ci-large.yml index 4da5f1b1a..70ae0cf56 100644 --- a/.github/workflows/ci-large.yml +++ b/.github/workflows/ci-large.yml @@ -23,7 +23,7 @@ jobs: os: [ubuntu-latest] #os: [ubuntu-latest, macos-latest] cc: [gcc-12] - ngx: [1.25.2] + ngx: [1.25.3] runtime: [wasmtime, wasmer, v8] wasmtime: [12.0.2] wasmer: [3.1.1] @@ -66,7 +66,7 @@ jobs: matrix: os: [ubuntu-22.04] cc: [gcc-12] - ngx: [1.25.2] + ngx: [1.25.3] runtime: [wasmer, wasmtime, v8] wasmtime: [12.0.2] wasmer: [3.1.1] @@ -132,7 +132,7 @@ jobs: label: [""] os: [ubuntu-latest] cc: [clang-13, clang-14, gcc-10, gcc-11] - ngx: [1.25.2] + ngx: [1.25.3] runtime: [wasmtime, wasmer, v8] wasmtime: [12.0.2] wasmer: [3.1.1] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5aca944a..fcb97d42e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: label: [""] os: [ubuntu-latest] cc: [gcc-12] - ngx: [1.25.2] + ngx: [1.25.3] openresty: [""] runtime: [wasmer] wasmtime: [""] @@ -45,7 +45,7 @@ jobs: wasmtime: 12.0.2 os: ubuntu-latest cc: gcc-12 - ngx: 1.25.2 + ngx: 1.25.3 ssl: ssl debug: debug hup: hup @@ -54,7 +54,7 @@ jobs: v8: 11.4.183.23 os: ubuntu-latest cc: gcc-12 - ngx: 1.25.2 + ngx: 1.25.3 ssl: ssl debug: debug hup: no_hup @@ -72,7 +72,7 @@ jobs: - label: dynamic_nginx os: ubuntu-latest cc: gcc-12 - ngx: 1.25.2 + ngx: 1.25.3 runtime: wasmtime wasmtime: 12.0.2 ssl: ssl @@ -82,7 +82,7 @@ jobs: # No SSL - os: ubuntu-latest cc: gcc-12 - ngx: 1.25.2 + ngx: 1.25.3 runtime: wasmer wasmer: 3.1.1 ssl: no_ssl @@ -137,7 +137,7 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} parallel-finished: true - carryforward: 'unit-ngx_1.25.2-wasmer-ssl-debug-no_hup-static,unit-ngx_1.25.2-wasmer-ssl-no_debug-no_hup-static,unit-ngx_1.25.2-wasmtime-ssl-debug-hup-static,unit-ngx_1.25.2-wasmtime-ssl-debug-hup-dynamic,unit-ngx_1.25.2-v8-ssl-debug-no_hup-static,unit-ngx_1.21.6-wasmer-ssl-debug-no_hup-static,unit-ngx_1.25.2-wasmer-no_ssl-no_debug-no_hup-static,unit-openresty_1.21.4.2-wasmtime-ssl-debug-no_hup-static,unit-openresty_1.21.4.2-wasmtime-ssl-debug-no_hup-dynamic' + carryforward: 'unit-ngx_1.25.3-wasmer-ssl-debug-no_hup-static,unit-ngx_1.25.3-wasmer-ssl-no_debug-no_hup-static,unit-ngx_1.25.3-wasmtime-ssl-debug-hup-static,unit-ngx_1.25.3-wasmtime-ssl-debug-hup-dynamic,unit-ngx_1.25.3-v8-ssl-debug-no_hup-static,unit-ngx_1.21.6-wasmer-ssl-debug-no_hup-static,unit-ngx_1.25.3-wasmer-no_ssl-no_debug-no_hup-static,unit-openresty_1.21.4.2-wasmtime-ssl-debug-no_hup-static,unit-openresty_1.21.4.2-wasmtime-ssl-debug-no_hup-dynamic' valgrind: name: 'Valgrind' @@ -148,7 +148,7 @@ jobs: label: [""] os: [ubuntu-22.04] cc: [gcc-12] - ngx: [1.25.2] + ngx: [1.25.3] openresty: [""] runtime: [wasmer] wasmtime: [""] @@ -162,7 +162,7 @@ jobs: wasmtime: 12.0.2 os: ubuntu-22.04 cc: gcc-12 - ngx: 1.25.2 + ngx: 1.25.3 hup: no_hup debug: debug # V8 @@ -170,7 +170,7 @@ jobs: v8: 11.4.183.23 os: ubuntu-22.04 cc: gcc-12 - ngx: 1.25.2 + ngx: 1.25.3 debug: debug hup: no_hup # OpenResty @@ -252,7 +252,7 @@ jobs: # No SSL - os: ubuntu-latest cc: clang-15 - ngx: 1.25.2 + ngx: 1.25.3 runtime: wasmer wasmer: 3.1.1 ssl: no_ssl @@ -277,7 +277,7 @@ jobs: matrix: os: [ubuntu-latest] cc: [clang-15, gcc-12] - ngx: [1.25.2] + ngx: [1.25.3] runtime: [wasmtime, wasmer, v8] wasmtime: [12.0.2] wasmer: [3.1.1] diff --git a/Makefile b/Makefile index 7fa0a314b..5f905793e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -NGX ?= 1.25.2 +NGX ?= 1.25.3 OPENSSL ?= 3.1.3 WASMTIME ?= 12.0.2 WASMER ?= 3.1.1 diff --git a/valgrind.suppress b/valgrind.suppress index 29fdcddfe..88b872faa 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