Skip to content

Commit 91a6ad6

Browse files
authored
Add support for Nginx 1.30.1 and 1.31.0 (#378)
1 parent c63cf33 commit 91a6ad6

2 files changed

Lines changed: 36 additions & 6 deletions

File tree

.gitlab/build-and-test-all.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ build-nginx-all:
5757
- "1.29.7"
5858
- "1.29.8"
5959
- "1.30.0"
60+
- "1.30.1"
61+
- "1.31.0"
6062
WAF: ["ON", "OFF"]
6163

6264
build-nginx-rum-all:
@@ -97,6 +99,8 @@ build-nginx-rum-all:
9799
- "1.29.7"
98100
- "1.29.8"
99101
- "1.30.0"
102+
- "1.30.1"
103+
- "1.31.0"
100104
WAF: ["OFF"]
101105

102106
build-ingress-nginx-all:
@@ -301,6 +305,14 @@ test-nginx-all-bis:
301305
BASE_IMAGE: ["nginx:1.30.0", "nginx:1.30.0-alpine"]
302306
NGINX_VERSION: ["1.30.0"]
303307
WAF: ["ON", "OFF"]
308+
- ARCH: ["amd64", "arm64"]
309+
BASE_IMAGE: ["nginx:1.30.1", "nginx:1.30.1-alpine"]
310+
NGINX_VERSION: ["1.30.1"]
311+
WAF: ["ON", "OFF"]
312+
- ARCH: ["amd64", "arm64"]
313+
BASE_IMAGE: ["nginx:1.31.0", "nginx:1.31.0-alpine"]
314+
NGINX_VERSION: ["1.31.0"]
315+
WAF: ["ON", "OFF"]
304316
- ARCH: ["amd64", "arm64"]
305317
BASE_IMAGE: ["amazonlinux:2023.11.20260427.1"]
306318
NGINX_VERSION: ["1.28.3"]
@@ -432,6 +444,14 @@ test-nginx-rum-all:
432444
BASE_IMAGE: ["nginx:1.30.0"]
433445
NGINX_VERSION: ["1.30.0"]
434446
WAF: ["OFF"]
447+
- ARCH: ["amd64", "arm64"]
448+
BASE_IMAGE: ["nginx:1.30.1"]
449+
NGINX_VERSION: ["1.30.1"]
450+
WAF: ["OFF"]
451+
- ARCH: ["amd64", "arm64"]
452+
BASE_IMAGE: ["nginx:1.31.0"]
453+
NGINX_VERSION: ["1.31.0"]
454+
WAF: ["OFF"]
435455

436456
test-ingress-nginx-all:
437457
extends:

.gitlab/build-and-test-fast.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ build-nginx-fast:
6262
- "1.27.5"
6363
- "1.28.3"
6464
- "1.29.8"
65-
- "1.30.0"
65+
- "1.30.1"
66+
- "1.31.0"
6667
WAF: ["ON", "OFF"]
6768

6869
build-ingress-nginx-fast:
@@ -102,7 +103,8 @@ build-nginx-rum-fast:
102103
- "1.27.5"
103104
- "1.28.3"
104105
- "1.29.8"
105-
- "1.30.0"
106+
- "1.30.1"
107+
- "1.31.0"
106108
WAF: ["OFF"]
107109

108110
test-nginx-fast:
@@ -133,8 +135,12 @@ test-nginx-fast:
133135
NGINX_VERSION: ["1.29.8"]
134136
WAF: ["ON", "OFF"]
135137
- ARCH: ["amd64", "arm64"]
136-
BASE_IMAGE: ["nginx:1.30.0", "nginx:1.30.0-alpine"]
137-
NGINX_VERSION: ["1.30.0"]
138+
BASE_IMAGE: ["nginx:1.30.1", "nginx:1.30.1-alpine"]
139+
NGINX_VERSION: ["1.30.1"]
140+
WAF: ["ON", "OFF"]
141+
- ARCH: ["amd64", "arm64"]
142+
BASE_IMAGE: ["nginx:1.31.0", "nginx:1.31.0-alpine"]
143+
NGINX_VERSION: ["1.31.0"]
138144
WAF: ["ON", "OFF"]
139145
- ARCH: ["amd64", "arm64"]
140146
BASE_IMAGE: ["amazonlinux:2023.11.20260427.1"]
@@ -195,8 +201,12 @@ test-nginx-rum-fast:
195201
NGINX_VERSION: ["1.29.8"]
196202
WAF: ["OFF"]
197203
- ARCH: ["amd64", "arm64"]
198-
BASE_IMAGE: ["nginx:1.30.0"]
199-
NGINX_VERSION: ["1.30.0"]
204+
BASE_IMAGE: ["nginx:1.30.1"]
205+
NGINX_VERSION: ["1.30.1"]
206+
WAF: ["OFF"]
207+
- ARCH: ["amd64", "arm64"]
208+
BASE_IMAGE: ["nginx:1.31.0"]
209+
NGINX_VERSION: ["1.31.0"]
200210
WAF: ["OFF"]
201211

202212
coverage:

0 commit comments

Comments
 (0)