diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index cda0be28e..981cdeb4c 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -585,9 +585,16 @@ jobs: # 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 + # the runner image to supply .NET/Node. + # + # REVERTED to `ubuntu-latest` (server-management#604 / ersatztv#406). The caveat below the + # original #390 rationale turned out to be the deciding factor: on an API-touching PR this + # job does a full `dotnet build`, so it is NOT a small job, and "capacity 4 absorbs that" was + # only true while nothing enforced the SUM of the lanes' memory caps. It didn't: 6 slots x 10g + # on a 25 GiB host drove bumblebee to load 713 with 21 GiB swapped. The `small` lane is now + # sized for genuinely-tiny jobs, and #604 grew the `ubuntu-latest` lane instead (ci-runner + # 48 GiB at capacity 4 + a bumblebee overflow slot), which fixes the queue at the source. + runs-on: ubuntu-latest container: image: 192.168.1.95:3000/timothy/ersatztv-ci:07048b8 credentials: @@ -668,9 +675,11 @@ jobs: # a status, so it is safe as a required check). format: name: Formatting (changed .cs conform to .editorconfig) - # `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 + # Was on the `small` lane (ersatztv#390) to dodge a ~29 min queue; reverted to `ubuntu-latest` + # in ersatztv#406 — `dotnet format` needs the .NET SDK and real memory, so it does not belong + # in a lane sized for seconds-long shell jobs. See the api-docs job above for the full + # rationale; server-management#604 grew this lane so the queue it was dodging is gone. + runs-on: ubuntu-latest container: image: 192.168.1.95:3000/timothy/ersatztv-ci:07048b8 credentials: