Skip to content

fix: repair the dogfood image build on release/2.29 - #30874

Merged
droopy4096 merged 2 commits into
release/2.29from
fix/dogfood-cargo-pins-2.29
Oct 15, 2026
Merged

droopy4096 merged 2 commits into
release/2.29from
fix/dogfood-cargo-pins-2.29

Conversation

@denisra

@denisra denisra commented Oct 15, 2026 •

Copy link
Copy Markdown
Collaborator

Problem

build_image in the dogfood workflow fails on every release/2.29 run since at least 2026-10-09 (e.g. #30555, #30811). Two independent causes, both forms of pinned-branch rot:

  1. "Build and push Non-Nix image": the Rust stage of dogfood/coder/Dockerfile runs cargo install jj-cli typos-cli watchexec-cli@2.3.2, two crates unpinned and none locked, so every build resolves today's crates.io against the rustc frozen by the base image digest (1.91.1):
    error: cannot install package `jj-cli 0.46.0`, it requires rustc 1.97.1 or newer
    error: cannot install package `typos-cli 1.51.1`, it requires rustc 1.95 or newer
    error: could not compile `watchexec-cli` (lib) due to 1 previous error
    
  2. "Build Nix image": the nixpkgs pinned in this branch's flake.lock fetches google-chrome-stable_138.0.7204.49, which Google no longer serves (same as ci(.github/workflows): remove nix from dogfood image matrix (backport 2.34) #30858 on 2.34).

main has neither problem: it stopped compiling these tools in the image and removed the nix image in #26022.

Changes

  • dogfood/coder/Dockerfile: cargo install --locked jj-cli@0.45.1 typos-cli@1.49.0 watchexec-cli@2.3.2. The two pins are the newest releases whose declared minimum rustc is at or below 1.91 (checked against crates.io metadata); --locked uses each crate's own lockfile, which is what fixes the watchexec-cli compile. Also corrects the stale toolchain comment (said 1.86.0, digest is 1.91.1).
  • .github/workflows/dogfood.yaml: drop the Nix install, Nix cache, "Build Nix image" and "Push Nix image" steps and the flake.* path triggers, mirroring the workflow part of ci(.github/workflows): remove nix from dogfood image matrix (backport 2.34) #30858. flake.nix, nix/docker.nix and the template's nix option are left alone to keep the backport small, as on 2.34.

Verification

This PR touches dogfood/** and the workflow, so its own build_image run is the test. The first push (Dockerfile only) got "Build and push Non-Nix image" green for the first time since October 9 and then failed on the nix step; the second push removes that step.

Unblocks #30555 and the Go backport to 2.29.

🤖 Generated with Claude Code

Part of ENT-220

The dogfood image build on release/2.29 has failed on every run since
at least 2026-10-09. The Rust stage runs `cargo install` without
version pins or --locked, so it resolves whatever crates.io serves
today against the rustc frozen by the base image digest (1.91.1):

    error: cannot install package `jj-cli 0.46.0`, it requires rustc 1.97.1
    error: cannot install package `typos-cli 1.51.1`, it requires rustc 1.95
    error: could not compile `watchexec-cli` (lib) due to 1 previous error

Pin jj-cli and typos-cli to the newest releases whose minimum rustc is
at or below 1.91, keep watchexec-cli at 2.3.2, and pass --locked so
each crate's own lockfile is used instead of freshly resolved
transitive dependencies. Fix the stale toolchain comment while here.

main no longer compiles these tools in the image, so this only affects
the 2.29 branch.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
@denisra denisra changed the title fix: pin cargo-installed tools in the dogfood image (2.29) fix: repair the dogfood image build on release/2.29 Oct 15, 2026
With the cargo pins fixed, build_image now fails one step later in
"Build Nix image": the nixpkgs pinned in this branch's flake.lock
fetches google-chrome-stable 138.0.7204.49, which Google no longer
serves. main removed the nix image in #26022 and release/2.34 in
#30858; do the same here. The flake, nix/docker.nix and the template's
nix option are left in place to keep the backport small, matching the
2.34 change.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
@denisra
denisra requested review from droopy4096 and removed request for jdomeracki-coder October 15, 2026 19:12
Comment thread dogfood/coder/Dockerfile
apt-get update || true
RUN apt-get update && apt-get install -y libssl-dev openssl pkg-config build-essential
RUN cargo install jj-cli typos-cli watchexec-cli@2.3.2
RUN cargo install --locked jj-cli@0.45.1 typos-cli@1.49.0 watchexec-cli@2.3.2

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm worried we're exposing ourselves to more pin-rot further down the road, but there needs to be a systemic solution here, as it stands we follow what we're doing elsewhere so for this PR it' fine. I'll file a follow-up issue to tackle this later.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have moved all of that to mise on more recent releases, so this seems to only apply to 2.29, which will most likely get one more release before going EOL.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filed the follow-up: #30876

@droopy4096 droopy4096 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looking good - no further nix references

@droopy4096
droopy4096 merged commit c7a6d61 into release/2.29 Oct 15, 2026
25 checks passed
@droopy4096
droopy4096 deleted the fix/dogfood-cargo-pins-2.29 branch October 15, 2026 19:24
@github-actions github-actions Bot locked and limited conversation to collaborators Oct 15, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants