Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b38f4760e7 | ||
|
|
02cd70092e | ||
|
|
c11e2b19f8 | ||
|
|
cada2273bb |
@@ -90,11 +90,11 @@ jobs:
|
||||
- name: Registry login
|
||||
if: ${{ steps.meta.outputs.push == 'true' }}
|
||||
env:
|
||||
TOKEN: ${{ secrets.ZEGIT_PACKAGE_TOKEN }}
|
||||
TOKEN: ${{ secrets.ZEGIT_CI_PACKAGE_TOKEN }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
if [ -z "${TOKEN:-}" ]; then
|
||||
echo "::error::ZEGIT_PACKAGE_TOKEN is not set, so this dispatch would build an image and push nothing. Issue a package-write token and store it as this secret."
|
||||
echo "::error::ZEGIT_CI_PACKAGE_TOKEN is not visible to this run. It is the org-scoped package-write token every zegit-zoo image workflow uses (docs: flux-config docs/rotation/forge-secrets.yaml); this repository must be able to read the org secret, and the name must match."
|
||||
exit 1
|
||||
fi
|
||||
mkdir -p "$HOME/.docker"
|
||||
@@ -106,17 +106,25 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
REF="${REGISTRY}/${IMAGE_PATH}:${{ steps.meta.outputs.tag }}"
|
||||
# No --output on a validation run: buildctl v0.32 has no "cacheonly"
|
||||
# exporter (run 16, 2026-09-08: 'exporter "cacheonly" could not be
|
||||
# found'), so every push-triggered validation since this workflow
|
||||
# was added had failed — silently, since nothing depended on it. A
|
||||
# build without an exporter still builds every stage on both arches.
|
||||
if [ "${{ steps.meta.outputs.push }}" = "true" ]; then
|
||||
out="type=image,name=${REF},push=true"
|
||||
else
|
||||
out="type=cacheonly"
|
||||
fi
|
||||
buildctl build --progress=plain \
|
||||
--frontend dockerfile.v0 \
|
||||
--local context=. \
|
||||
--local dockerfile=. \
|
||||
--opt platform=linux/amd64,linux/arm64 \
|
||||
--output "$out"
|
||||
--output "type=image,name=${REF},push=true"
|
||||
else
|
||||
buildctl build --progress=plain \
|
||||
--frontend dockerfile.v0 \
|
||||
--local context=. \
|
||||
--local dockerfile=. \
|
||||
--opt platform=linux/amd64,linux/arm64
|
||||
fi
|
||||
|
||||
# The image is a TOOLCHAIN, so "it built" is not the property that matters
|
||||
# — "it still contains what the gates shell out to" is. build-image.yml
|
||||
@@ -142,7 +150,7 @@ jobs:
|
||||
echo "FROM ${REF}"
|
||||
echo 'RUN set -eu; \'
|
||||
echo ' python3 -c "import yaml, sys; print(\"python3+yaml\", sys.version.split()[0])"; \'
|
||||
echo ' for t in gcc node bash make curl tar openssl jq; do \'
|
||||
echo ' for t in gcc node bash make curl tar openssl jq chromium-browser psql; do \'
|
||||
echo ' command -v "$t" >/dev/null || { echo "MISSING: $t" >&2; exit 1; }; \'
|
||||
echo ' echo "ok: $t"; \'
|
||||
echo ' done; \'
|
||||
@@ -154,8 +162,7 @@ jobs:
|
||||
--frontend dockerfile.v0 \
|
||||
--local context="$work" \
|
||||
--local dockerfile="$work" \
|
||||
--opt platform=linux/amd64,linux/arm64 \
|
||||
--output type=cacheonly
|
||||
--opt platform=linux/amd64,linux/arm64
|
||||
echo "✓ toolchain intact on linux/amd64 and linux/arm64"
|
||||
|
||||
- name: Summary
|
||||
|
||||
Reference in new issue
Block a user