Skip to content

Commit cefa443

Browse files
Copilotphlax
andcommitted
Restructure config schema with distro as top-level key
- Changed from builds/manifests sections to distro-based organization - Each distro (debian/ubuntu) now contains ci.paths and manifests - Updated workflow filters to use new paths (.debian.ci, .ubuntu.ci, etc) - Addresses feedback from @phlax Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
1 parent e2f13ea commit cefa443

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

.github/config.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# Configuration for envoy-build-tools CI/CD
2+
# Each distro (debian/ubuntu) contains:
3+
# - ci.paths: Path-based build detection
4+
# - manifests: OCI manifest specifications
5+
# Note: {sha} placeholder will be replaced with the actual docker SHA at runtime
26

3-
# Path-based build detection - determines which distros to build based on changed files
4-
builds:
5-
debian:
7+
debian:
8+
ci:
69
paths:
710
- docker/linux/debian/**
811
- docker/linux/debian_build.sh
@@ -11,19 +14,7 @@ builds:
1114
- docker/linux/common_fun.sh
1215
- docker/linux/group_manifests.sh
1316
- .github/workflows/**
14-
ubuntu:
15-
paths:
16-
- docker/linux/ubuntu/**
17-
- docker/push.sh
18-
- docker/linux/build.sh
19-
- docker/linux/common_fun.sh
20-
- docker/linux/group_manifests.sh
21-
- .github/workflows/**
22-
23-
# Manifest configuration templates - defines OCI manifest specifications
24-
# Note: {sha} placeholder will be replaced with the actual docker SHA at runtime
25-
manifests:
26-
debian:
17+
manifests:
2718
- name: envoy-build
2819
tag: devtools-{sha}
2920
registry: docker.io/envoyproxy
@@ -92,7 +83,17 @@ manifests:
9283
architectures:
9384
- amd64
9485
artifact-pattern: oci-debian-{arch}/debian-mobile-{sha}-{arch}.tar
95-
ubuntu:
86+
87+
ubuntu:
88+
ci:
89+
paths:
90+
- docker/linux/ubuntu/**
91+
- docker/push.sh
92+
- docker/linux/build.sh
93+
- docker/linux/common_fun.sh
94+
- docker/linux/group_manifests.sh
95+
- .github/workflows/**
96+
manifests:
9697
- name: envoy-build-ubuntu
9798
tag: ci-{sha}
9899
registry: docker.io/envoyproxy

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
input: .github/config.yml
3939
input-format: yaml-path
4040
filter: |
41-
.builds
41+
{debian: .debian.ci, ubuntu: .ubuntu.ci}
4242
- uses: envoyproxy/toolshed/gh-actions/torun@actions-v0.3.30
4343
id: torun
4444
with:
@@ -140,7 +140,7 @@ jobs:
140140
input: .github/config.yml
141141
input-format: yaml-path
142142
filter: >-
143-
.manifests.debian
143+
.debian.manifests
144144
| map(. + {
145145
tag: (.tag | gsub("{sha}"; "${{ steps.docker-sha.outputs.sha }}")),
146146
"artifact-pattern": (.["artifact-pattern"] | gsub("{sha}"; "${{ steps.docker-sha.outputs.sha }}")),
@@ -155,7 +155,7 @@ jobs:
155155
input: .github/config.yml
156156
input-format: yaml-path
157157
filter: >-
158-
.manifests.ubuntu
158+
.ubuntu.manifests
159159
| map(. + {
160160
tag: (.tag | gsub("{sha}"; "${{ steps.docker-sha.outputs.sha }}")),
161161
"artifact-pattern": (.["artifact-pattern"] | gsub("{sha}"; "${{ steps.docker-sha.outputs.sha }}")),

0 commit comments

Comments
 (0)