ci: Extract manifest specs from workflow to config.yml (#494)

Signed-off-by: Ryan Northey <[email protected]>
Co-authored-by: copilot-swe-agent[bot] <[email protected]>

Author: Copilot

.github/config.yml

@@ -1,17 +1,146 @@
+# Configuration for envoy-build-tools CI/CD
+# Each distro (debian/ubuntu) contains:
+# - ci.paths: Path-based build detection
+# - manifests: OCI manifest specifications
+# Note: {sha} placeholder will be replaced with the actual docker SHA at runtime
+
 debian:
-  paths:
-  - docker/linux/debian/**
-  - docker/linux/debian_build.sh
-  - docker/push.sh
-  - docker/linux/build.sh
-  - docker/linux/common_fun.sh
-  - docker/linux/group_manifests.sh
-  - .github/workflows/**
+  ci:
+    paths:
+    - docker/linux/debian/*
+    - docker/linux/debian_build.sh
+    - docker/push.sh
+    - docker/linux/build.sh
+    - docker/linux/common_fun.sh
+    - docker/linux/group_manifests.sh
+    - .github/**/*
+  manifests:
+  # devtools
+  - name: envoy-build
+    tag: devtools-{sha}
+    registry: docker.io/envoyproxy
+    architectures:
+    - amd64
+    - arm64
+    artifact-pattern: oci-debian-{arch}/debian-devtools-{sha}-{arch}.tar
+  # ci
+  - name: envoy-build
+    tag: ci-{sha}
+    registry: docker.io/envoyproxy
+    architectures:
+    - amd64
+    - arm64
+    artifact-pattern: oci-debian-{arch}/debian-ci-{sha}-{arch}.tar
+  # worker
+  - name: envoy-build
+    tag: worker-{sha}
+    registry: docker.io/envoyproxy
+    architectures:
+    - amd64
+    - arm64
+    artifact-pattern: oci-debian-{arch}/debian-worker-{sha}-{arch}.tar
+  # worker (gcr)
+  - name: envoy-build
+    tag: worker-{sha}
+    registry: gcr.io/envoy-ci
+    architectures:
+    - amd64
+    - arm64
+    artifact-pattern: oci-debian-{arch}/debian-worker-{sha}-{arch}.tar
+  # gcc
+  - name: envoy-build
+    tag: gcc-{sha}
+    registry: docker.io/envoyproxy
+    architectures:
+    - amd64
+    - arm64
+    artifact-pattern: oci-debian-{arch}/debian-gcc-{sha}-{arch}.tar
+  # gcc (gcr)
+  - name: envoy-build
+    tag: gcc-{sha}
+    registry: gcr.io/envoy-ci
+    architectures:
+    - amd64
+    - arm64
+    artifact-pattern: oci-debian-{arch}/debian-gcc-{sha}-{arch}.tar
+  # docker
+  - name: envoy-build
+    tag: docker-{sha}
+    registry: docker.io/envoyproxy
+    architectures:
+    - amd64
+    - arm64
+    artifact-pattern: oci-debian-{arch}/debian-docker-{sha}-{arch}.tar
+  # test
+  - name: envoy-build
+    tag: test-{sha}
+    registry: docker.io/envoyproxy
+    architectures:
+    - amd64
+    - arm64
+    artifact-pattern: oci-debian-{arch}/debian-test-{sha}-{arch}.tar
+  # llvm
+  - name: envoy-build
+    tag: llvm-{sha}
+    registry: docker.io/envoyproxy
+    architectures:
+    - amd64
+    artifact-pattern: oci-debian-{arch}/debian-llvm-{sha}-{arch}.tar
+  # mobile
+  - name: envoy-build
+    tag: mobile-{sha}
+    registry: docker.io/envoyproxy
+    architectures:
+    - amd64
+    artifact-pattern: oci-debian-{arch}/debian-mobile-{sha}-{arch}.tar
+
 ubuntu:
-  paths:
-  - docker/linux/ubuntu/**
-  - docker/push.sh
-  - docker/linux/build.sh
-  - docker/linux/common_fun.sh
-  - docker/linux/group_manifests.sh
-  - .github/workflows/**
+  ci:
+    paths:
+    - docker/linux/ubuntu/*
+    - docker/push.sh
+    - docker/linux/build.sh
+    - docker/linux/common_fun.sh
+    - docker/linux/group_manifests.sh
+    - .github/**/*
+  manifests:
+  # ci
+  - name: envoy-build-ubuntu
+    tag: ci-{sha}
+    registry: docker.io/envoyproxy
+    architectures:
+    - arm64
+    - amd64
+    artifact-pattern: oci-ubuntu-{arch}/ubuntu-ci-{sha}-{arch}.tar
+  # mobile
+  - name: envoy-build-ubuntu
+    tag: mobile-{sha}
+    registry: docker.io/envoyproxy
+    architectures:
+    - amd64
+    artifact-pattern: oci-ubuntu-{arch}/ubuntu-mobile-{sha}-{arch}.tar
+  # test
+  - name: envoy-build-ubuntu
+    tag: test-{sha}
+    registry: docker.io/envoyproxy
+    architectures:
+    - amd64
+    artifact-pattern: oci-ubuntu-{arch}/ubuntu-test-{sha}-{arch}.tar
+  # full
+  - name: envoy-build-ubuntu
+    tag: full-{sha}
+    registry: docker.io/envoyproxy
+    architectures:
+    - amd64
+    - arm64
+    artifact-pattern: oci-ubuntu-{arch}/ubuntu-full-{sha}-{arch}.tar
+    additional-tags:
+    - "{sha}"
+  # full (gcr)
+  - name: envoy-build
+    tag: "{sha}"
+    registry: gcr.io/envoy-ci
+    architectures:
+    - amd64
+    - arm64
+    artifact-pattern: oci-ubuntu-{arch}/ubuntu-full-{sha}-{arch}.tar

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
         input: .github/config.yml
         input-format: yaml-path
         filter: |
-          .
+          {debian: .debian.ci, ubuntu: .ubuntu.ci}
     - uses: envoyproxy/toolshed/gh-actions/[email protected]
       id: torun
       with:
@@ -137,122 +137,31 @@ jobs:
       id: config-debian
       uses: envoyproxy/toolshed/gh-actions/[email protected]
       with:
-        input-format: yaml
+        input: .github/config.yml
+        input-format: yaml-path
         filter: >-
-          {manifests: .}
-        input: |
-          - name: envoy-build
-            tag: devtools-${{ steps.docker-sha.outputs.sha }}
-            registry: docker.io/envoyproxy
-            architectures:
-            - amd64
-            - arm64
-            artifact-pattern: oci-debian-{arch}/debian-devtools-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-          - name: envoy-build
-            tag: ci-${{ steps.docker-sha.outputs.sha }}
-            registry: docker.io/envoyproxy
-            architectures:
-            - amd64
-            - arm64
-            artifact-pattern: oci-debian-{arch}/debian-ci-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-          - name: envoy-build
-            tag: worker-${{ steps.docker-sha.outputs.sha }}
-            registry: docker.io/envoyproxy
-            architectures:
-            - amd64
-            - arm64
-            artifact-pattern: oci-debian-{arch}/debian-worker-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-          - name: envoy-build
-            tag: worker-${{ steps.docker-sha.outputs.sha }}
-            registry: gcr.io/envoy-ci
-            architectures:
-            - amd64
-            - arm64
-            artifact-pattern: oci-debian-{arch}/debian-worker-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-          - name: envoy-build
-            tag: gcc-${{ steps.docker-sha.outputs.sha }}
-            registry: docker.io/envoyproxy
-            architectures:
-            - amd64
-            - arm64
-            artifact-pattern: oci-debian-{arch}/debian-gcc-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-          - name: envoy-build
-            tag: gcc-${{ steps.docker-sha.outputs.sha }}
-            registry: gcr.io/envoy-ci
-            architectures:
-            - amd64
-            - arm64
-            artifact-pattern: oci-debian-{arch}/debian-gcc-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-          - name: envoy-build
-            tag: docker-${{ steps.docker-sha.outputs.sha }}
-            registry: docker.io/envoyproxy
-            architectures:
-            - amd64
-            - arm64
-            artifact-pattern: oci-debian-{arch}/debian-docker-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-          - name: envoy-build
-            tag: test-${{ steps.docker-sha.outputs.sha }}
-            registry: docker.io/envoyproxy
-            architectures:
-            - amd64
-            - arm64
-            artifact-pattern: oci-debian-{arch}/debian-test-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-          - name: envoy-build
-            tag: llvm-${{ steps.docker-sha.outputs.sha }}
-            registry: docker.io/envoyproxy
-            architectures:
-            - amd64
-            artifact-pattern: oci-debian-{arch}/debian-llvm-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-          - name: envoy-build
-            tag: mobile-${{ steps.docker-sha.outputs.sha }}
-            registry: docker.io/envoyproxy
-            architectures:
-            - amd64
-            artifact-pattern: oci-debian-{arch}/debian-mobile-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
+          .debian.manifests
+          | map(. + {
+              tag: (.tag | gsub("{sha}"; "${{ steps.docker-sha.outputs.sha }}")),
+              "artifact-pattern": (.["artifact-pattern"] | gsub("{sha}"; "${{ steps.docker-sha.outputs.sha }}")),
+              "additional-tags": (if .["additional-tags"] then .["additional-tags"] | map(gsub("{sha}"; "${{ steps.docker-sha.outputs.sha }}")) else null end)
+            })
+          | {manifests: .}
     - name: Generate manifest configuration (Ubuntu)
       if: steps.built-distros.outputs.include-ubuntu == 'true'
       id: config-ubuntu
       uses: envoyproxy/toolshed/gh-actions/[email protected]
       with:
-        input-format: yaml
+        input: .github/config.yml
+        input-format: yaml-path
         filter: >-
-          {manifests: .}
-        input: |
-          - name: envoy-build-ubuntu
-            tag: ci-${{ steps.docker-sha.outputs.sha }}
-            registry: docker.io/envoyproxy
-            architectures:
-            - arm64
-            - amd64
-            artifact-pattern: oci-ubuntu-{arch}/ubuntu-ci-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-          - name: envoy-build-ubuntu
-            tag: mobile-${{ steps.docker-sha.outputs.sha }}
-            registry: docker.io/envoyproxy
-            architectures:
-            - amd64
-            artifact-pattern: oci-ubuntu-{arch}/ubuntu-mobile-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-          - name: envoy-build-ubuntu
-            tag: test-${{ steps.docker-sha.outputs.sha }}
-            registry: docker.io/envoyproxy
-            architectures:
-            - amd64
-            artifact-pattern: oci-ubuntu-{arch}/ubuntu-test-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-          - name: envoy-build-ubuntu
-            tag: full-f8d1fd9bdac3a7843d1e69816456648989d238be
-            registry: docker.io/envoyproxy
-            architectures:
-            - amd64
-            - arm64
-            artifact-pattern: oci-ubuntu-{arch}/ubuntu-full-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
-            additional-tags:
-            - ${{ steps.docker-sha.outputs.sha }}
-          - name: envoy-build
-            tag: ${{ steps.docker-sha.outputs.sha }}
-            registry: gcr.io/envoy-ci
-            architectures:
-            - amd64
-            - arm64
-            artifact-pattern: oci-ubuntu-{arch}/ubuntu-full-${{ steps.docker-sha.outputs.sha }}-{arch}.tar
+          .ubuntu.manifests
+          | map(. + {
+              tag: (.tag | gsub("{sha}"; "${{ steps.docker-sha.outputs.sha }}")),
+              "artifact-pattern": (.["artifact-pattern"] | gsub("{sha}"; "${{ steps.docker-sha.outputs.sha }}")),
+              "additional-tags": (if .["additional-tags"] then .["additional-tags"] | map(gsub("{sha}"; "${{ steps.docker-sha.outputs.sha }}")) else null end)
+            })
+          | {manifests: .}
     - name: Merge manifest configurations
       id: config
       if: >-