ci: make both workflows able to run at all #1

Merged
dtourolle merged 6 commits from ci/green-the-runner into master 2026-09-03 18:19:42 +00:00
3 changed files with 13 additions and 7 deletions
Showing only changes of commit 9bcc765408 - Show all commits
+3 -3
View File
@@ -40,7 +40,7 @@ jobs:
# bumping the tag in scripts/ci/build_builder_image.sh AND here, in one
# commit -- see that script's header.
container:
image: gitea.tourolle.paris/dtourolle/sae-builder-cpu:v2
image: gitea.tourolle.paris/dtourolle/sae-builder-cpu:v3
steps:
- name: Checkout repository
@@ -73,8 +73,8 @@ jobs:
# line above and the image that actually landed disagree, which is
# exactly the drift the pinning exists to prevent -- so it fails the
# job rather than building against an unknown toolchain.
[ "$SAE_BUILDER_VERSION" = "v2" ] || {
echo "image reports version '$SAE_BUILDER_VERSION', workflow pins v2" >&2
[ "$SAE_BUILDER_VERSION" = "v3" ] || {
echo "image reports version '$SAE_BUILDER_VERSION', workflow pins v3" >&2
exit 1
}
+5
View File
@@ -92,6 +92,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
git \
ca-certificates \
curl \
# unzip is not optional here: the T2 replay fixtures ship as a zip in the
# generic package registry and scripts/artifacts/pull_artifacts.sh unpacks
# them with it. Without unzip that step exits 127 and the replay tier has no
# input -- which is a missing tool reported as a missing fixture.
unzip \
# Gitea's act_runner executes JS actions (actions/checkout, upload-artifact)
# with the `node` found *inside* the container. Without this the job cannot
# even check the repository out. Same reason as the kpnpp-builder image.
+5 -4
View File
@@ -5,9 +5,9 @@
# TRACES: DP-007 | PR-004
#
# Usage:
# scripts/ci/build_builder_image.sh # build only, tag v2
# scripts/ci/build_builder_image.sh # build only, tag v3
# scripts/ci/build_builder_image.sh --push # build and push
# scripts/ci/build_builder_image.sh --tag v3 --push # bump the pinned tag
# scripts/ci/build_builder_image.sh --tag v4 --push # bump the pinned tag
# scripts/ci/build_builder_image.sh --no-cache # force a clean rebuild
#
# The tag is the contract with CI. .gitea/workflows/unit-tests.yml names an
@@ -35,9 +35,10 @@ DOCKERFILE="Dockerfile.builder-cpu"
# image it landed in reports this same version, so a drift shows up as a failed
# job rather than as a build against the wrong toolchain.
#
# v2 adds libfftw3-dev: the learned scene-boundary detector's find_library is
# v2 added libfftw3-dev: the learned scene-boundary detector's find_library is
# REQUIRED at configure time, so v1 cannot configure this repository at all.
TAG="v2"
# v3 adds unzip, which pull_artifacts.sh needs to unpack the replay fixtures.
TAG="v3"
PUSH=0
EXTRA_ARGS=()