Skip to content

Commit 2a7e0be

Browse files
committed
fix: "always" builds were omitted from releases
1 parent c43f4c2 commit 2a7e0be

File tree

2 files changed

+30
-12
lines changed

2 files changed

+30
-12
lines changed

.circleci/config.yml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,19 @@ workflows:
120120
base-image: "amazonlinux:2.0.20230119.1"
121121
build-image: "datadog/docker-library:nginx-datadog-build-amazonlinux_2.0.20230119.1"
122122
nginx-version: "1.22.1"
123-
123+
filters:
124+
tags:
125+
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
124126
- test:
125127
name: "test on amazonlinux:2.0.20230119.1"
126128
base-image: "amazonlinux:2.0.20230119.1"
127129
nginx-modules-path: "/usr/share/nginx/modules"
128130
nginx-conf-path: "/etc/nginx/nginx.conf"
129131
requires:
130132
- "build on amazonlinux:2.0.20230119.1"
131-
133+
filters:
134+
tags:
135+
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
132136
- build:
133137
name: "build on amazonlinux:2.0.20221210.0"
134138
base-image: "amazonlinux:2.0.20221210.0"
@@ -420,29 +424,37 @@ workflows:
420424
base-image: "nginx:1.23.2-alpine"
421425
build-image: "datadog/docker-library:nginx-datadog-build-nginx_1.23.2-alpine"
422426
nginx-version: "1.23.2"
423-
427+
filters:
428+
tags:
429+
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
424430
- test:
425431
name: "test on nginx:1.23.2-alpine"
426432
base-image: "nginx:1.23.2-alpine"
427433
nginx-modules-path: "/usr/lib/nginx/modules"
428434
nginx-conf-path: "/etc/nginx/nginx.conf"
429435
requires:
430436
- "build on nginx:1.23.2-alpine"
431-
437+
filters:
438+
tags:
439+
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
432440
- build:
433441
name: "build on nginx:1.23.2"
434442
base-image: "nginx:1.23.2"
435443
build-image: "datadog/docker-library:nginx-datadog-build-nginx_1.23.2"
436444
nginx-version: "1.23.2"
437-
445+
filters:
446+
tags:
447+
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
438448
- test:
439449
name: "test on nginx:1.23.2"
440450
base-image: "nginx:1.23.2"
441451
nginx-modules-path: "/usr/lib/nginx/modules"
442452
nginx-conf-path: "/etc/nginx/nginx.conf"
443453
requires:
444454
- "build on nginx:1.23.2"
445-
455+
filters:
456+
tags:
457+
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
446458
- build:
447459
name: "build on nginx:1.23.1-alpine"
448460
base-image: "nginx:1.23.1-alpine"
@@ -712,15 +724,19 @@ workflows:
712724
base-image: "nginx:1.21.4-alpine"
713725
build-image: "datadog/docker-library:nginx-datadog-build-nginx_1.21.4-alpine"
714726
nginx-version: "1.21.4"
715-
727+
filters:
728+
tags:
729+
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
716730
- test:
717731
name: "test on nginx:1.21.4-alpine"
718732
base-image: "nginx:1.21.4-alpine"
719733
nginx-modules-path: "/usr/lib/nginx/modules"
720734
nginx-conf-path: "/etc/nginx/nginx.conf"
721735
requires:
722736
- "build on nginx:1.21.4-alpine"
723-
737+
filters:
738+
tags:
739+
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
724740
- build:
725741
name: "build on nginx:1.21.4"
726742
base-image: "nginx:1.21.4"

bin/generate_jobs_yaml.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,19 @@ END_NGINX_TAGS
112112

113113
while read base_image nginx_version nginx_modules_path nginx_conf_path always; do
114114
base_image_without_colons=$(echo "$base_image" | tr ':' '_')
115-
if [ "$always" != 'always' ]; then
116-
filters=$(cat <<'END_FILTERS'
115+
filters=$(cat <<'END_FILTERS'
117116
filters:
118117
tags:
119118
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
119+
END_FILTERS
120+
)
121+
if [ "$always" != 'always' ]; then
122+
filters=$(cat <<END_FILTERS
123+
$filters
120124
branches:
121125
ignore: /.*/
122126
END_FILTERS
123127
)
124-
else
125-
filters=''
126128
fi
127129
cat <<END_SNIPPET
128130
- build:

0 commit comments

Comments
 (0)