From 6d48dca5d3394eab1f57e604f57398cac8435695 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Wed, 16 Sep 2026 21:28:56 +0000 Subject: [PATCH] Let callers pick their platform list and add the server lists The vanagon build workflow always took its default platform list from the vanagon key in platforms.json, which is the agent's list. openvox-server packages are noarch and are built once per OS version, so they need their own list. A platforms_key input names the key to read, defaulting to vanagon so existing callers see no change. The server-vanagon keys for main and 8.x carry the openvox-server platforms as vanagon platform names, matching the platforms the ezbake lists build. Signed-off-by: nmburgan <13688219+nmburgan@users.noreply.github.com> Assisted-by: Claude Fable 5.1 --- .github/workflows/build_vanagon.yml | 8 +++++- platforms.json | 38 +++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_vanagon.yml b/.github/workflows/build_vanagon.yml index 355ebf0..24f6f04 100644 --- a/.github/workflows/build_vanagon.yml +++ b/.github/workflows/build_vanagon.yml @@ -15,6 +15,11 @@ on: description: 'A comma-separated list of platforms to build for. Do not include spaces. If not provided, will use the default list of platforms supported by OpenVox.' required: false type: string + platforms_key: + description: 'The key in platforms.json holding the default platform list for this project. Only used when platform_list is not provided.' + required: false + type: string + default: 'vanagon' vanagon_branch: description: 'The branch of the vanagon repository to use' required: false @@ -58,10 +63,11 @@ jobs: - id: set-matrix env: PLATFORM_LIST: ${{ inputs.platform_list }} + PLATFORMS_KEY: ${{ inputs.platforms_key }} PROJECT_NAME: ${{ inputs.project_name }} BRANCH: ${{ inputs.branch }} run: | - mapfile -t default_list < <(jq -r --arg branch "${BRANCH}" '.[$branch].vanagon[]' .shared-actions/platforms.json) + mapfile -t default_list < <(jq -r --arg branch "${BRANCH}" --arg key "${PLATFORMS_KEY}" '.[$branch][$key][]' .shared-actions/platforms.json) if [[ -n "${PLATFORM_LIST}" ]]; then IFS=',' read -r -a platforms <<< "${PLATFORM_LIST}" else diff --git a/platforms.json b/platforms.json index 30c57c4..8ec922f 100644 --- a/platforms.json +++ b/platforms.json @@ -56,6 +56,23 @@ "redhatfips-8", "redhatfips-9", "redhatfips-10" + ], + "server-vanagon": [ + "amazon-2023-x86_64", + "debian-13-amd64", + "el-8-x86_64", + "el-9-x86_64", + "el-10-x86_64", + "fedora-43-x86_64", + "fedora-44-x86_64", + "redhatfips-8-x86_64", + "redhatfips-9-x86_64", + "redhatfips-10-x86_64", + "sles-15-x86_64", + "sles-16-x86_64", + "ubuntu-22.04-amd64", + "ubuntu-24.04-amd64", + "ubuntu-26.04-amd64" ] }, "8.x": { @@ -125,6 +142,27 @@ "ezbake-fips-rpm": [ "redhatfips-8", "redhatfips-9" + ], + "server-vanagon": [ + "amazon-2-x86_64", + "amazon-2023-x86_64", + "debian-11-amd64", + "debian-12-amd64", + "debian-13-amd64", + "el-8-x86_64", + "el-9-x86_64", + "el-10-x86_64", + "fedora-42-x86_64", + "fedora-43-x86_64", + "fedora-44-x86_64", + "redhatfips-8-x86_64", + "redhatfips-9-x86_64", + "sles-15-x86_64", + "sles-16-x86_64", + "ubuntu-22.04-amd64", + "ubuntu-24.04-amd64", + "ubuntu-25.04-amd64", + "ubuntu-26.04-amd64" ] } }