Skip to content

refactor: update build workflows to use new matrix structure and streamline version handling #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rwaffen merged 3 commits into from
Aug 22, 2025
Merged

refactor: update build workflows to use new matrix structure and streamline version handling #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
023059b
refactor: update build workflows to use new matrix structure and stre…
rwaffen Aug 1, 2025
50044fb
chore: update permissions and upgrade actions/checkout version in wor…
rwaffen Aug 20, 2025
c8eee07
refactor: update job names in security scanning workflow for clarity
rwaffen Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 27 additions & 70 deletions .github/workflows/build_container.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,71 +16,29 @@ jobs:
setup-matrix:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
build_matrix: ${{ steps.set-build-matrix.outputs.build_matrix }}
tag_matrix: ${{ steps.set-tag-matrix.outputs.tag_matrix }}
steps:
- name: Source checkout
uses: actions/checkout@v5

- name: 'Setup yq'
uses: dcarbone/install-yq-action@v1.3.1

- id: set-matrix
run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT
- id: set-build-matrix
run: echo "build_matrix=$(bash matrix.sh build)" >> $GITHUB_OUTPUT

build-X86-container:
runs-on: ubuntu-24.04
permissions:
contents: read
packages: write
needs: setup-matrix
strategy:
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
steps:
- id: server_version
run: echo "server_version=${{ matrix.server_version }}" | cut -d- -f1 >> $GITHUB_OUTPUT

- id: db_version
run: echo "db_version=${{ matrix.db_version }}" | cut -d- -f1 >> $GITHUB_OUTPUT

- name: Build OpenVox Server ${{ matrix.release }} container
uses: voxpupuli/gha-build-and-publish-a-container@v2
with:
registry_password: ${{ secrets.GITHUB_TOKEN }}
build_args: |
OPENVOX_RELEASE=${{ matrix.release }}
OPENVOXSERVER_VERSION=${{ matrix.server_version }}
OPENVOXDB_VERSION=${{ matrix.db_version }}
R10K_VERSION=${{ matrix.r10k_version }}
RUGGED_VERSION=${{ matrix.rugged_version }}
build_arch: linux/amd64
build_context: openvoxserver
buildfile: openvoxserver/Containerfile
tags: |
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64

- name: Build Alpine OpenVox Server ${{ matrix.release }} container
uses: voxpupuli/gha-build-and-publish-a-container@v2
with:
registry_password: ${{ secrets.GITHUB_TOKEN }}
build_args: |
OPENVOX_RELEASE=${{ matrix.release }}
OPENVOXSERVER_VERSION=${{ steps.server_version.outputs.server_version }}
OPENVOXDB_VERSION=${{ steps.db_version.outputs.db_version }}
R10K_VERSION=${{ matrix.r10k_version }}
build_arch: linux/amd64
build_context: openvoxserver
buildfile: openvoxserver/Containerfile.alpine
tags: |
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64-alpine
- id: set-tag-matrix
run: echo "tag_matrix=$(bash matrix.sh tag)" >> $GITHUB_OUTPUT

build-ARM-container:
runs-on: ubuntu-24.04-arm
build-and-push-container:
runs-on: ${{ matrix.runner }}
permissions:
contents: read
packages: write
needs: setup-matrix
strategy:
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
matrix: ${{ fromJson(needs.setup-matrix.outputs.build_matrix) }}
steps:
- id: server_version
run: echo "server_version=${{ matrix.server_version }}" | cut -d- -f1 >> $GITHUB_OUTPUT
Expand All @@ -98,11 +56,11 @@ jobs:
OPENVOXDB_VERSION=${{ matrix.db_version }}
R10K_VERSION=${{ matrix.r10k_version }}
RUGGED_VERSION=${{ matrix.rugged_version }}
build_arch: linux/arm64
build_arch: linux/${{ matrix.platform }}
build_context: openvoxserver
buildfile: openvoxserver/Containerfile
tags: |
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-${{ matrix.platform }}

- name: Build Alpine OpenVox Server ${{ matrix.release }} container
uses: voxpupuli/gha-build-and-publish-a-container@v2
Expand All @@ -113,11 +71,11 @@ jobs:
OPENVOXSERVER_VERSION=${{ steps.server_version.outputs.server_version }}
OPENVOXDB_VERSION=${{ steps.db_version.outputs.db_version }}
R10K_VERSION=${{ matrix.r10k_version }}
build_arch: linux/arm64
build_arch: linux/${{ matrix.platform }}
build_context: openvoxserver
buildfile: openvoxserver/Containerfile.alpine
tags: |
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64-alpine
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-${{ matrix.platform }}-alpine

create-multi-arch-manifests:
runs-on: ubuntu-latest
Expand All @@ -126,10 +84,9 @@ jobs:
packages: write
needs:
- setup-matrix
- build-X86-container
- build-ARM-container
- build-and-push-container
strategy:
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
matrix: ${{ fromJson(needs.setup-matrix.outputs.tag_matrix) }}
steps:
- name: Log in to the ghcr.io registry
uses: docker/login-action@v3
Expand All @@ -155,56 +112,56 @@ jobs:
run: |
docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ steps.server_version.outputs.server_version }}-${{ github.ref_name }} \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-amd64

docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }} \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-amd64

docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:latest \
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-arm64 \
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-x86_64
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-amd64

# on docker.io we use the voxpupuli namespace because new organizations are not free anymore
#
docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:${{ steps.server_version.outputs.server_version }}-${{ github.ref_name }} \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-amd64

docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:${{ matrix.release }} \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-amd64

docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:latest \
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-arm64 \
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-x86_64
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-amd64

- name: Create Alpine multi arch manifests
run: |
docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ steps.server_version.outputs.server_version }}-${{ github.ref_name }}-alpine-beta \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64-alpine \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64-alpine
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-amd64-alpine

docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-alpine-beta \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64-alpine \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64-alpine
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-amd64-alpine

docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:latest-alpine-beta \
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-arm64-alpine \
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-x86_64-alpine
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-amd64-alpine

# on docker.io we use the voxpupuli namespace because new organizations are not free anymore
docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:${{ steps.server_version.outputs.server_version }}-${{ github.ref_name }}-alpine-beta \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64-alpine \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64-alpine
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-amd64-alpine

docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:${{ matrix.release }}-alpine-beta \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64-alpine \
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64-alpine
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-amd64-alpine

docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:latest-alpine-beta \
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-arm64-alpine \
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-x86_64-alpine
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-amd64-alpine

update-dockerhub-description:
runs-on: ubuntu-latest
Expand Down
28 changes: 10 additions & 18 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: CI🚦
name: 🚦 CI

on:
pull_request:
Expand All @@ -14,35 +14,27 @@ jobs:
setup-matrix:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
build_matrix: ${{ steps.set-build-matrix.outputs.build_matrix }}
steps:
- name: Source checkout
uses: actions/checkout@v5

- name: 'Setup yq'
uses: dcarbone/install-yq-action@v1.3.1

- id: set-matrix
run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT
- id: set-build-matrix
run: echo "build_matrix=$(bash matrix.sh build)" >> $GITHUB_OUTPUT

general_ci:
build_ci_container:
name: Build ${{ matrix.platform }} CI container
runs-on: ${{ matrix.runner }}
permissions:
# required for all workflows
security-events: write

# only required for workflows in private repositories
actions: read
contents: read
uses: voxpupuli/crafty/.github/workflows/general_ci.yaml@main
with:
shellcheck_scan_dir: './openvoxserver'

build_test_container:
name: 'Build test container'
runs-on: ubuntu-latest
needs: setup-matrix
strategy:
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
matrix: ${{ fromJson(needs.setup-matrix.outputs.build_matrix) }}
steps:
- name: Checkout repository
uses: actions/checkout@v5
Expand Down Expand Up @@ -72,6 +64,7 @@ jobs:
context: openvoxserver
file: openvoxserver/Containerfile
push: false
platforms: linux/${{ matrix.platform }}
build-args: |
OPENVOX_RELEASE=${{ matrix.release }}
OPENVOXSERVER_VERSION=${{ matrix.server_version }}
Expand All @@ -94,8 +87,7 @@ jobs:

tests:
needs:
- general_ci
- build_test_container
- build_ci_container
runs-on: ubuntu-latest
name: Test suite
steps:
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/security_scanning.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@ jobs:
setup-matrix:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
build_matrix: ${{ steps.set-build-matrix.outputs.build_matrix }}
steps:
- name: Source checkout
uses: actions/checkout@v5

- name: 'Setup yq'
uses: dcarbone/install-yq-action@v1.3.1

- id: set-matrix
run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT
- id: set-build-matrix
run: echo "build_matrix=$(bash matrix.sh build)" >> $GITHUB_OUTPUT

scan_ci_container:
name: 'Scan CI container'
runs-on: ubuntu-latest
name: 'Scan ${{ matrix.platform }} CI container'
runs-on: ${{ matrix.runner }}
permissions:
actions: read
contents: read
security-events: write
needs: setup-matrix
strategy:
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
matrix: ${{ fromJson(needs.setup-matrix.outputs.build_matrix) }}
steps:
- name: Checkout repository
uses: actions/checkout@v5
Expand All @@ -50,12 +50,13 @@ jobs:
const version = agentVersion.split('-')[0];
core.setOutput('version', version);

- name: Build CI container
- name: Build ${{ matrix.platform }} CI container
uses: docker/build-push-action@v6
with:
tags: 'ci/openvoxserver:${{ steps.extract_version.outputs.version }}'
context: openvoxserver
file: openvoxserver/Containerfile
platforms: linux/${{ matrix.platform }}
push: false
build-args: |
OPENVOX_RELEASE=${{ matrix.release }}
Expand Down
6 changes: 6 additions & 0 deletions build_platforms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
platforms:
- platform: amd64
runner: ubuntu-24.04
- platform: arm64
runner: ubuntu-24.04-arm
15 changes: 15 additions & 0 deletions matrix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

yq -o=json build_platforms.yaml > build_platforms.json
yq -o=json build_versions.yaml > build_versions.json

if [ "$1" == "build" ]; then
jq -rc --slurp '{ include: [ .[1].include[] as $i | .[0].platforms[] as $p | $i + {"platform": $p.platform, "runner": $p.runner} ] }' build_platforms.json build_versions.json
fi

if [ "$1" == "tag" ]; then
jq -cr '.include |= map({ release: .release, server_version: .server_version, db_version: .db_version })' build_versions.json
fi

rm build_platforms.json
rm build_versions.json
Loading