mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-08 19:56:53 +00:00
kevinveenbirkenbachandClaude Opus 5
2a7455bd90
Both architectures were claimed to work and only one was ever exercised. The deploy matrix now carries an architecture the way it carries mode, tor, distro and filesystem, so every run proves both. A job cannot ask for an architecture the way it asks for a distro, because the architecture is the machine rather than something the job installs on it. The matrix therefore carries a runner label and `runs-on` reads it, and an architecture without a label in RUNNERS is a build error rather than a row that lands on the wrong hardware and still reports green. assert_architecture.sh checks the runner it actually got, because a label that stops resolving to arm64 would otherwise go unnoticed forever. Assignment is rotation, not chance: two architectures against five distros and fifteen distro/filesystem positions are coprime enough that every combination comes round. A role narrows the pool through `architectures` in its meta/services.yml; without one it takes whatever the rotation hands it. An empty intersection aborts instead of silently removing the role from the run. Images are built per architecture and pushed under an architecture-suffixed tag, then merged into the plain tag by manifest_all.sh; pushing the plain tag from both builds would let the last one win and send half the rows to the wrong platform. cleanup.sh now protects the `ci-<sha>-<architecture>` children of a protected tag, because the plain tag is an index over them and deleting a child leaves it unpullable on that platform. label.py is split out of axes.py, which the 500-line limit no longer fits. Writing a job title and reading one back belong together: a retrigger that recovers an axis wrongly replays a different deploy than the one that failed, and a drifting artifact name makes the failure reporter download nothing. The leading `.*` in LABEL_RE is greedy on purpose so it anchors on the last mode glyph; a reusable-workflow caller path carries a glyph of its own, and test_selection.py guards the case. Verified: 313 unit tests and 48 subtests across utils/github/variant, utils/roles and cli/meta/ci. Locally, a deploy pinned to arm64 reaches ok=1444 and its image builds log aarch64-linux-gnu paths. Not verified here: actionlint over the seven changed workflows, and a full `make test`. The matrix doubles the row count, so runtime and runner availability change for every CI run from here. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
37 lines
1.1 KiB
Bash
Executable File
37 lines
1.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
#
|
|
# Compute the matrix JSON + effective image_tag for images-build-ci and
|
|
# write both to $GITHUB_OUTPUT. Replaces the inline `run:` block of the
|
|
# "Compute matrix JSON" step.
|
|
#
|
|
# Usage:
|
|
# images_build_outputs.sh "<distros>" "<image_tag_override>" "<architectures>"
|
|
set -euo pipefail
|
|
|
|
distros="${1:-}"
|
|
override="${2:-}"
|
|
architectures="${3:-}"
|
|
|
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
repo_root="$(cd "${script_dir}/../../.." && pwd)"
|
|
json="$(bash "${script_dir}/distros_matrix.sh" "${distros}")"
|
|
arch_json="$(cd "${repo_root}" && "${PYTHON:-python3}" -m cli.meta.ci.architectures "${architectures}")"
|
|
|
|
if [[ -n "${override}" ]]; then
|
|
image_tag="${override}"
|
|
else
|
|
: "${GITHUB_SHA:?GITHUB_SHA must be set when no image_tag override is provided}"
|
|
image_tag="ci-${GITHUB_SHA}"
|
|
fi
|
|
|
|
: "${GITHUB_OUTPUT:?GITHUB_OUTPUT must be set}"
|
|
{
|
|
echo "matrix=${json}"
|
|
echo "image_tag=${image_tag}"
|
|
echo "architectures=${arch_json}"
|
|
} >>"${GITHUB_OUTPUT}"
|
|
|
|
echo "Using matrix: ${json}"
|
|
echo "Using image tag: ${image_tag}"
|
|
echo "Using architectures: ${arch_json}"
|