From 6a9e27c6b840e579ccbcbbce7c31ee96822ab2cd Mon Sep 17 00:00:00 2001 From: Timothy Date: Fri, 17 Jul 2026 09:13:09 +0200 Subject: [PATCH] =?UTF-8?q?ci(390):=20fix=20CI-image=20smoke=20test=20?= =?UTF-8?q?=E2=80=94=20reportgenerator=20--version=20exits=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build-time smoke test failed the image build even though the toolchain was healthy: reportgenerator prints its version banner then exits 1 ("No report files specified"), so it has no clean version probe. Probe the dotnet-tool shim on PATH instead. dotnet --info confirmed the SDK + .NET 10.0.10 runtimes resolve correctly on the ffmpeg base (ICU/glibc fine). Refs #390 --- .gitea/workflows/ci-image.yml | 3 +- .gitea/workflows/docker-build.yml | 131 ++++++++++++++++++------------ docker/ci/Dockerfile | 13 ++- 3 files changed, 90 insertions(+), 57 deletions(-) diff --git a/.gitea/workflows/ci-image.yml b/.gitea/workflows/ci-image.yml index bc2c35160..f68612842 100644 --- a/.gitea/workflows/ci-image.yml +++ b/.gitea/workflows/ci-image.yml @@ -113,11 +113,12 @@ jobs: docker run --rm --entrypoint /bin/bash "$IMG" -euxc ' dotnet --version dotnet ef --version - reportgenerator --version node --version ffmpeg -version | head -1 git --version python3 --version + # reportgenerator --version exits 1 ("No report files specified"); probe the shim. + command -v reportgenerator ' echo "CI image OK. Pin this in .gitea/workflows/docker-build.yml -> CI_IMAGE_REF:" echo " ${IMG}" diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index fee965db9..e0d3672b1 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -12,6 +12,20 @@ name: Build ErsatzTV Image # # `:latest` is intentionally the test/dev channel (per ersatztv#3); prod pins # `:prod`, never `:latest` (enforced in the prod compose — server-management#481). +# +# TOOLCHAIN IMAGE (ersatztv#390): the jobs that need a toolchain (`test`, `migrations`, +# `functional-e2e`, `api-docs`, `format`) run inside our shared CI image via `container:` +# instead of installing .NET/Node/ffmpeg per run. It ships the .NET 10 SDK, Node 22, +# prod-identical ffmpeg, and the dotnet-ef/reportgenerator global tools — so those jobs carry +# no setup-dotnet, no setup-node, no apt, no `dotnet tool install`. Built by ci-image.yml from +# docker/ci/Dockerfile. Project deps (NuGet/npm) are NOT baked in and stay on actions/cache. +# +# The pin below is an IMMUTABLE :, never :latest — a bad toolchain push would otherwise +# break every converted job at once. It is repeated per job because `jobs..container.image` +# cannot read the workflow `env` context. **Bump all five together**; see docs/ci-cd.md -> +# "CI toolchain image" for the two-step procedure. +# +# CI image pin: 192.168.1.95:3000/timothy/ersatztv-ci:__CI_IMAGE_REF__ on: workflow_dispatch: @@ -40,6 +54,11 @@ jobs: test: name: Build & test (.NET) runs-on: ubuntu-latest + container: + image: 192.168.1.95:3000/timothy/ersatztv-ci:__CI_IMAGE_REF__ + credentials: + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_PASSWORD }} steps: - name: Checkout uses: actions/checkout@v4 @@ -48,11 +67,6 @@ jobs: # are only needed by the `build` job's `git describe` (ersatztv#190) fetch-depth: 1 - - name: Setup .NET - uses: actions/setup-dotnet@v4 - with: - dotnet-version: '10.0.x' - - name: Cache NuGet packages uses: actions/cache@v4 with: @@ -63,12 +77,14 @@ jobs: - name: Restore run: dotnet restore - - name: Setup Node - uses: actions/setup-node@v4 + # Replaces setup-node's built-in `cache: npm`. The toolchain image supplies node/npm, but + # the SPA's package downloads are project deps, so they stay cached per lockfile. + - name: Cache npm packages + uses: actions/cache@v4 with: - node-version: '22.x' - cache: npm - cache-dependency-path: web/package-lock.json + path: ~/.npm + key: npm-${{ runner.os }}-${{ hashFiles('web/package-lock.json') }} + restore-keys: npm-${{ runner.os }}- - name: Install SPA dependencies working-directory: web @@ -121,10 +137,8 @@ jobs: exit 0 fi echo "Found ${#reports[@]} coverage report(s)." - # `update` is install-or-update (idempotent, unlike `install` which errors if the tool - # is already present under set -e); pinned for reproducible summary output. - dotnet tool update --global dotnet-reportgenerator-globaltool --version 5.5.10 >/dev/null - export PATH="$PATH:$HOME/.dotnet/tools" + # reportgenerator is baked into the CI toolchain image (docker/ci/Dockerfile) and already + # on PATH — no per-run `dotnet tool` install. Bump its version there (ersatztv#390). reportgenerator \ "-reports:coverage/**/coverage.cobertura.xml" \ "-targetdir:coverage/report" \ @@ -139,6 +153,11 @@ jobs: migrations: name: EF migration integrity (SQLite + MySql) runs-on: ubuntu-latest + container: + image: 192.168.1.95:3000/timothy/ersatztv-ci:__CI_IMAGE_REF__ + credentials: + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_PASSWORD }} # Independent gate (not a 'needs' of build yet) so the new MySql-service dependency # can't block image builds until it's proven reliable on the runner. Promote to a # required check / build dependency once green. (ersatztv#13) @@ -162,11 +181,6 @@ jobs: # default fetch-depth: 1 -- this job never runs git describe/log, only # actions/checkout@v4's default (shallow) history is needed (ersatztv#190) - - name: Setup .NET - uses: actions/setup-dotnet@v4 - with: - dotnet-version: '10.0.x' - - name: Cache NuGet packages uses: actions/cache@v4 with: @@ -180,14 +194,13 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore - - name: Install dotnet-ef - run: dotnet tool install --global dotnet-ef --version 9.0.12 + # dotnet-ef is baked into the CI toolchain image (docker/ci/Dockerfile) and already on PATH + # — no per-run `dotnet tool install`. Bump its version there (ersatztv#390). # SQLite is the prod provider; both checks validated locally. - name: SQLite — model drift + apply all migrations to a fresh DB run: | set -euo pipefail - export PATH="$PATH:$HOME/.dotnet/tools" echo "::group::SQLite model drift (has-pending-model-changes)" dotnet ef migrations has-pending-model-changes --no-build --configuration Release \ --context TvContext --startup-project ErsatzTV --project ErsatzTV.Infrastructure.Sqlite -- --provider Sqlite @@ -210,7 +223,6 @@ jobs: MySql__ConnectionString: "Server=mysql;Port=3306;Database=ersatztv_migrations;Uid=root;Pwd=ersatztv;DefaultCommandTimeout=300;" run: | set -euo pipefail - export PATH="$PATH:$HOME/.dotnet/tools" echo "::group::MySql model drift (has-pending-model-changes)" dotnet ef migrations has-pending-model-changes --no-build --configuration Release \ --context TvContext --startup-project ErsatzTV --project ErsatzTV.Infrastructure.MySql -- --provider MySql @@ -246,17 +258,17 @@ jobs: # reliable (same rollout the `migrations` job used). SQLite default provider -> no DB service. # Runs on PRs and on main (regression net); skipped for v* tag builds. if: github.event_name == 'pull_request' || github.ref == 'refs/heads/main' + container: + image: 192.168.1.95:3000/timothy/ersatztv-ci:__CI_IMAGE_REF__ + credentials: + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_PASSWORD }} steps: - name: Checkout uses: actions/checkout@v4 with: fetch-depth: 1 - - name: Setup .NET - uses: actions/setup-dotnet@v4 - with: - dotnet-version: '10.0.x' - - name: Cache NuGet packages uses: actions/cache@v4 with: @@ -267,12 +279,12 @@ jobs: - name: Restore run: dotnet restore - - name: Setup Node - uses: actions/setup-node@v4 + - name: Cache npm packages + uses: actions/cache@v4 with: - node-version: '22.x' - cache: npm - cache-dependency-path: web/package-lock.json + path: ~/.npm + key: npm-${{ runner.os }}-${{ hashFiles('web/package-lock.json') }} + restore-keys: npm-${{ runner.os }}- - name: Install SPA dependencies working-directory: web @@ -285,8 +297,11 @@ jobs: - name: Build (Release) run: dotnet build ErsatzTV.sln --configuration Release --no-restore - - name: Ensure ffmpeg is available - run: command -v ffmpeg >/dev/null 2>&1 || (sudo apt-get update && sudo apt-get install -y ffmpeg) + # The old `command -v ffmpeg || sudo apt-get install ffmpeg` step is gone (ersatztv#390): + # the toolchain image ships the same ffmpeg build prod runs, so the binary is already here. + # That step also cost 110s of every run to install a dependency this harness never uses — + # it boots the app (whose only ffmpeg touch at startup is a LogWarning from + # FFmpegLocatorService) and drives curl-only contracts that never transcode. - name: Boot instance and run functional-E2E harness run: | @@ -503,7 +518,20 @@ jobs: # API path changed, the expensive steps skip and the job passes trivially. api-docs: name: API docs in sync (OpenAPI + endpoint index) - runs-on: ubuntu-latest + # `small` lane (ersatztv#390): this job is ~5s on the ~90% of PRs that touch no API path, but + # it was queueing ~29 min behind the heavy jobs in the contended `ubuntu-latest` lane, which + # only has bumblebee-runner (capacity 2) + ci-runner. `small` has capacity 4, the same base + # image, and answers in ~5s. Moving it here (and `format`) also drops `ubuntu-latest` from 5 + # jobs to 3, which shortens the queue for `test`/`migrations`/`functional-e2e` too. + # This is only possible because `container:` makes the job self-contained — it no longer needs + # the runner image to supply .NET/Node. Caveat: on an API-touching PR this job does a full + # `dotnet build`, so it is not always a "small" job; capacity 4 absorbs that. + runs-on: small + container: + image: 192.168.1.95:3000/timothy/ersatztv-ci:__CI_IMAGE_REF__ + credentials: + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_PASSWORD }} if: github.event_name == 'pull_request' steps: - name: Checkout @@ -526,12 +554,6 @@ jobs: echo "No API-surface change -> skipping regeneration (job passes)." fi - - name: Setup .NET - if: steps.detect.outputs.api_changed == 'true' - uses: actions/setup-dotnet@v4 - with: - dotnet-version: '10.0.x' - - name: Cache NuGet packages if: steps.detect.outputs.api_changed == 'true' uses: actions/cache@v4 @@ -544,13 +566,13 @@ jobs: if: steps.detect.outputs.api_changed == 'true' run: dotnet restore - - name: Setup Node + - name: Cache npm packages if: steps.detect.outputs.api_changed == 'true' - uses: actions/setup-node@v4 + uses: actions/cache@v4 with: - node-version: '22.x' - cache: npm - cache-dependency-path: web/package-lock.json + path: ~/.npm + key: npm-${{ runner.os }}-${{ hashFiles('web/package-lock.json') }} + restore-keys: npm-${{ runner.os }}- - name: Install SPA dependencies if: steps.detect.outputs.api_changed == 'true' @@ -585,7 +607,14 @@ jobs: # a status, so it is safe as a required check). format: name: Formatting (changed .cs conform to .editorconfig) - runs-on: ubuntu-latest + # `small` lane (ersatztv#390) — 37s of work that was queueing ~29 min in the contended + # `ubuntu-latest` lane. See the api-docs job above for the full rationale. + runs-on: small + container: + image: 192.168.1.95:3000/timothy/ersatztv-ci:__CI_IMAGE_REF__ + credentials: + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_PASSWORD }} if: github.event_name == 'pull_request' steps: - name: Checkout @@ -609,12 +638,6 @@ jobs: echo "No .cs change -> skipping format verify (job passes)." fi - - name: Setup .NET - if: steps.detect.outputs.cs_changed == 'true' - uses: actions/setup-dotnet@v4 - with: - dotnet-version: '10.0.x' - - name: Cache NuGet packages if: steps.detect.outputs.cs_changed == 'true' uses: actions/cache@v4 diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile index d87701f5b..45db3c9e1 100644 --- a/docker/ci/Dockerfile +++ b/docker/ci/Dockerfile @@ -58,6 +58,12 @@ RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* +# actions/checkout clones as root into a runner-mounted workspace, which trips git's +# "detected dubious ownership in repository" guard and breaks every `git` call in a step +# (scripts/e2e-local.sh's `git rev-parse --show-toplevel`, the base-ref diffs, ...). Trusting all +# paths is the right call for a throwaway single-tenant CI container. +RUN git config --global --add safe.directory '*' + # .NET 10 SDK. Copied from the official SDK image rather than dotnet-install.sh: same mechanism as # docker/Dockerfile's runtime copy, one pinned artifact, no install script to fail at build time. # global.json pins sdk 10.0.0 with rollForward latestMinor, which this satisfies. @@ -82,10 +88,13 @@ RUN dotnet tool install --global dotnet-ef --version 9.0.12 && \ RUN set -eux; \ dotnet --info; \ dotnet ef --version; \ - reportgenerator --version; \ node --version; \ npm --version; \ git --version; \ python3 --version; \ ffmpeg -version; \ - ffprobe -version + ffprobe -version; \ + # reportgenerator has no clean version probe: `--version` prints the banner and then exits 1 + # ("No report files specified"), so asserting on it would fail this build. Probe that the + # dotnet-tool shim resolves on PATH instead. + command -v reportgenerator