Skip to content

Commit f922690

Browse files
dmehaladmehala
authored
chore: add NGINX 1.26.1 and 1.27.0 (#91)
- Use conditions on workflows instead of branch/tag filters
1 parent 2947e40 commit f922690

File tree

2 files changed

+59
-57
lines changed

2 files changed

+59
-57
lines changed

Diff for: ‎.circleci/config.yml

+57-54
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
version: 2.1
33
orbs:
44
codecov: codecov/[email protected]
5-
release_tag_only: &release_tag_only
6-
filters:
7-
tags:
8-
only: "/^v[0-9]+\\.[0-9]+\\.[0-9]+/"
9-
branches:
10-
ignore: "/.*/"
5+
6+
parameters:
7+
build_all:
8+
type: boolean
9+
default: false
1110

1211
executors:
1312
docker-amd64:
@@ -211,47 +210,39 @@ jobs:
211210
SC1071,SC1091,SC2317
212211
workflows:
213212
build-and-test:
213+
when:
214+
and:
215+
- not: << pipeline.git.tag >>
216+
- not: << pipeline.parameters.build_all >>
214217
jobs:
215218
- format
216219
- shellcheck:
217220
name: run shellcheck on shell scripts
218-
filters:
219-
tags:
220-
ignore: "/^v[0-9]+\\.[0-9]+\\.[0-9]+/"
221221
- build_amd64:
222222
matrix:
223223
parameters:
224224
nginx-version:
225225
- 1.22.1
226226
- 1.24.0
227227
- 1.25.4
228-
- 1.26.0
228+
- 1.27.0
229229
waf:
230230
- 'ON'
231231
- 'OFF'
232232
name: build << matrix.nginx-version >> on amd64 WAF << matrix.waf >>
233-
filters:
234-
tags:
235-
ignore: "/^v[0-9]+\\.[0-9]+\\.[0-9]+/"
236233
- build_arm64:
237234
matrix:
238235
parameters:
239236
nginx-version:
240237
- 1.22.1
241238
- 1.24.0
242-
- 1.26.0
239+
- 1.27.0
243240
waf:
244241
- 'ON'
245242
- 'OFF'
246243
name: build << matrix.nginx-version >> on arm64 WAF << matrix.waf >>
247-
filters:
248-
tags:
249-
ignore: "/^v[0-9]+\\.[0-9]+\\.[0-9]+/"
250244
- coverage:
251-
name: Coverage on 1.26.0 with WAF ON
252-
filters:
253-
tags:
254-
ignore: "/^v[0-9]+\\.[0-9]+\\.[0-9]+/"
245+
name: Coverage on 1.27.0 with WAF ON
255246
- test:
256247
matrix:
257248
parameters:
@@ -262,18 +253,15 @@ workflows:
262253
- 'ON'
263254
- 'OFF'
264255
base-image:
265-
- nginx:1.26.0-alpine
266-
- nginx:1.26.0
256+
- nginx:1.27.0-alpine
257+
- nginx:1.27.0
267258
nginx-version:
268-
- 1.26.0
259+
- 1.27.0
269260
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch
270261
>> WAF << matrix.waf >>
271262
requires:
272263
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf
273264
>>
274-
filters:
275-
tags:
276-
ignore: "/^v[0-9]+\\.[0-9]+\\.[0-9]+/"
277265
- test:
278266
matrix:
279267
parameters:
@@ -292,9 +280,6 @@ workflows:
292280
requires:
293281
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf
294282
>>
295-
filters:
296-
tags:
297-
ignore: "/^v[0-9]+\\.[0-9]+\\.[0-9]+/"
298283
- test:
299284
matrix:
300285
parameters:
@@ -311,18 +296,18 @@ workflows:
311296
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
312297
requires:
313298
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
314-
filters:
315-
tags:
316-
ignore: "/^v[0-9]+\\.[0-9]+\\.[0-9]+/"
317299
- system_tests:
318300
name: Run system tests
319301
requires:
320302
- build 1.25.4 on amd64 WAF ON
321303
build-and-test-all:
304+
when:
305+
or:
306+
- << pipeline.parameters.build_all >>
307+
- matches: { pattern: "^v[0-9]+\\.[0-9]+\\.[0-9]+", value: << pipeline.git.tag >> }
322308
jobs:
323309
# output of bin/generate_jobs_yaml.rb
324310
- build_amd64:
325-
<<: *release_tag_only
326311
matrix:
327312
parameters:
328313
nginx-version:
@@ -341,12 +326,13 @@ workflows:
341326
- 1.25.4
342327
- 1.25.5
343328
- 1.26.0
329+
- 1.26.1
330+
- 1.27.0
344331
waf:
345332
- 'ON'
346333
- 'OFF'
347334
name: build << matrix.nginx-version >> on amd64 WAF << matrix.waf >>
348335
- build_arm64:
349-
<<: *release_tag_only
350336
matrix:
351337
parameters:
352338
nginx-version:
@@ -365,12 +351,13 @@ workflows:
365351
- 1.25.4
366352
- 1.25.5
367353
- 1.26.0
354+
- 1.26.1
355+
- 1.27.0
368356
waf:
369357
- 'ON'
370358
- 'OFF'
371359
name: build << matrix.nginx-version >> on arm64 WAF << matrix.waf >>
372360
- test:
373-
<<: *release_tag_only
374361
matrix:
375362
parameters:
376363
arch:
@@ -389,7 +376,6 @@ workflows:
389376
requires:
390377
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
391378
- test:
392-
<<: *release_tag_only
393379
matrix:
394380
parameters:
395381
arch:
@@ -426,7 +412,40 @@ workflows:
426412
requires:
427413
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
428414
- test:
429-
<<: *release_tag_only
415+
matrix:
416+
parameters:
417+
arch:
418+
- amd64
419+
- arm64
420+
waf:
421+
- 'ON'
422+
- 'OFF'
423+
base-image:
424+
- nginx:1.27.0-alpine
425+
- nginx:1.27.0
426+
nginx-version:
427+
- 1.27.0
428+
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
429+
requires:
430+
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
431+
- test:
432+
matrix:
433+
parameters:
434+
arch:
435+
- amd64
436+
- arm64
437+
waf:
438+
- 'ON'
439+
- 'OFF'
440+
base-image:
441+
- nginx:1.26.1-alpine
442+
- nginx:1.26.1
443+
nginx-version:
444+
- 1.26.1
445+
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
446+
requires:
447+
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
448+
- test:
430449
matrix:
431450
parameters:
432451
arch:
@@ -444,7 +463,6 @@ workflows:
444463
requires:
445464
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
446465
- test:
447-
<<: *release_tag_only
448466
matrix:
449467
parameters:
450468
arch:
@@ -462,7 +480,6 @@ workflows:
462480
requires:
463481
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
464482
- test:
465-
<<: *release_tag_only
466483
matrix:
467484
parameters:
468485
arch:
@@ -480,7 +497,6 @@ workflows:
480497
requires:
481498
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
482499
- test:
483-
<<: *release_tag_only
484500
matrix:
485501
parameters:
486502
arch:
@@ -498,7 +514,6 @@ workflows:
498514
requires:
499515
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
500516
- test:
501-
<<: *release_tag_only
502517
matrix:
503518
parameters:
504519
arch:
@@ -516,7 +531,6 @@ workflows:
516531
requires:
517532
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
518533
- test:
519-
<<: *release_tag_only
520534
matrix:
521535
parameters:
522536
arch:
@@ -534,7 +548,6 @@ workflows:
534548
requires:
535549
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
536550
- test:
537-
<<: *release_tag_only
538551
matrix:
539552
parameters:
540553
arch:
@@ -552,7 +565,6 @@ workflows:
552565
requires:
553566
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
554567
- test:
555-
<<: *release_tag_only
556568
matrix:
557569
parameters:
558570
arch:
@@ -570,7 +582,6 @@ workflows:
570582
requires:
571583
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
572584
- test:
573-
<<: *release_tag_only
574585
matrix:
575586
parameters:
576587
arch:
@@ -588,7 +599,6 @@ workflows:
588599
requires:
589600
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
590601
- test:
591-
<<: *release_tag_only
592602
matrix:
593603
parameters:
594604
arch:
@@ -606,7 +616,6 @@ workflows:
606616
requires:
607617
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
608618
- test:
609-
<<: *release_tag_only
610619
matrix:
611620
parameters:
612621
arch:
@@ -624,7 +633,6 @@ workflows:
624633
requires:
625634
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
626635
- test:
627-
<<: *release_tag_only
628636
matrix:
629637
parameters:
630638
arch:
@@ -642,7 +650,6 @@ workflows:
642650
requires:
643651
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
644652
- test:
645-
<<: *release_tag_only
646653
matrix:
647654
parameters:
648655
arch:
@@ -659,7 +666,3 @@ workflows:
659666
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
660667
requires:
661668
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
662-
- system_tests:
663-
name: Run system tests
664-
requires:
665-
- build 1.25.4 on amd64 WAF ON

Diff for: ‎bin/generate_jobs_yaml.rb

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
amazonlinux:2.0.20220316.0 1.22.1
2222
amazonlinux:2.0.20220218.1 1.22.1
2323
amazonlinux:2.0.20220121.0 1.22.1
24+
nginx:1.26.1-alpine 1.26.1
25+
nginx:1.26.1 1.26.1
2426
nginx:1.26.0-alpine 1.26.0
2527
nginx:1.26.0 1.26.0
2628
nginx:1.25.5-alpine 1.25.5
@@ -64,7 +66,6 @@
6466

6567
puts <<-YAML.gsub(/^/, ' ')
6668
- build_amd64:
67-
<<: *release_tag_only
6869
matrix:
6970
parameters:
7071
nginx-version:
@@ -74,7 +75,6 @@
7475
- 'OFF'
7576
name: build << matrix.nginx-version >> on amd64 WAF << matrix.waf >>
7677
- build_arm64:
77-
<<: *release_tag_only
7878
matrix:
7979
parameters:
8080
nginx-version:
@@ -88,7 +88,6 @@
8888
all_specs.group_by(&:version).each do |version, specs|
8989
puts <<~YAML.gsub(/^/, ' ')
9090
- test:
91-
<<: *release_tag_only
9291
matrix:
9392
parameters:
9493
arch:

0 commit comments

Comments
 (0)