From c1f3878f32fd4d145b79fcf243a3d023d6e78721 Mon Sep 17 00:00:00 2001 From: Asen Lekov Date: Thu, 5 Nov 2026 15:31:30 +0200 Subject: [PATCH 1/2] feat(image): add ninja to the runner images Native Dart hooks need it: the dartcv4 hook of biokom-scan-app stops with "Failed to find ninja" on the large pool. Installing it in core gives every target the tool, and the smoke test now checks it. Co-Authored-By: Claude Opus 5.5 --- Dockerfile | 4 ++-- tests/image-smoke.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5650678..5693132 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,12 +93,12 @@ FROM myoung34/github-runner:$VERSION AS core # Packages that do not depend on JAVA_VERSION/NODE_VERSION, so this layer is # shared by every tag too. # - iproute2: ip tools -# - cmake, build-essential, swig: native builds +# - cmake, ninja-build, build-essential, swig: native builds # - xxd: not in the base image # - pigz: parallel gzip, used by tar/docker when available RUN apt-get -qq update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - iproute2 cmake build-essential swig xxd pigz \ + iproute2 cmake ninja-build build-essential swig xxd pigz \ && rm -rf /var/lib/apt/lists/* # rustup-init only, no toolchain: ~/.cargo and ~/.rustup are links into the diff --git a/tests/image-smoke.sh b/tests/image-smoke.sh index 961442a..69a32eb 100755 --- a/tests/image-smoke.sh +++ b/tests/image-smoke.sh @@ -72,7 +72,7 @@ fi if [ "$variant" = ndk ]; then check "NDK is installed" 'ls -d "$ANDROID_SDK_ROOT"/ndk/*/ >/dev/null' fi -for tool in xxd flock jq git rustup-init; do +for tool in xxd flock jq git ninja rustup-init; do check "$tool is on PATH" "command -v $tool" done From 3384e7bf4b800b883979bb19060a032d8fbddd97 Mon Sep 17 00:00:00 2001 From: Asen Lekov Date: Thu, 5 Nov 2026 15:41:19 +0200 Subject: [PATCH 2/2] test(slots): give each concurrent claim its own home The four claims shared one home, so they raced to replace the same cache links and one could die on "ln: Already exists", failing the test at random. Runners have a home each, so the race only ever existed in the test. Co-Authored-By: Claude Opus 5.5 --- tests/slots.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/slots.sh b/tests/slots.sh index 4bfaffc..950bc01 100644 --- a/tests/slots.sh +++ b/tests/slots.sh @@ -23,13 +23,14 @@ home="$work/home" mkdir -p "$data" "$home" # Run setup_slot in a child that holds its slot for $2 seconds and reports -# " " to file $1. +# " " to file $1. $3 is the container's home: runners have +# one each, so claims that run at the same time must not share one. claim() { - local out="$1" hold="$2" + local out="$1" hold="$2" container_home="${3:-$home}" ( # shellcheck source=SCRIPTDIR/../preflight-entrypoint.sh source "$root/preflight-entrypoint.sh" - CACHE_LINKS=("bun:$home/.bun" "pnpm/store:$home/.local/share/pnpm" "toolcache:$home/toolcache") + CACHE_LINKS=("bun:$container_home/.bun" "pnpm/store:$container_home/.local/share/pnpm" "toolcache:$container_home/toolcache") RUNNER_DATA_DIR="$data" setup_slot >/dev/null echo "$RUNNER_SLOT $LABELS $RUNNER_WORKDIR" >"$out" sleep "$hold" @@ -38,7 +39,7 @@ claim() { # --- concurrent claims ------------------------------------------------------- export LABELS=docker,light RUNNER_2_LABELS=docker,light,large -for i in 1 2 3 4; do claim "$work/claim.$i" 3 & done +for i in 1 2 3 4; do claim "$work/claim.$i" 3 "$work/home.$i" & done sleep 1 ids=$(cut -d' ' -f1 "$work"/claim.* | sort -n | tr '\n' ' ') [ "$ids" = "1 2 3 4 " ] || fail "concurrent claims got '$ids', want '1 2 3 4 '"