Repository navigation
fix: bump bundled terraform to 1.16.6 for 2.29 - #30555
Merged
Merged
Conversation
Bump the bundled Terraform binary from 1.14.5 to 1.16.5 to match main (#30516).
Contributor
|
👋 Hey @coder[bot]! This PR is targeting the Only bug fixes should be cherry-picked to release branches. If this is a bug fix, please update the PR title to match the conventional commit format: If this is not a bug fix, it likely should not target a release branch. |
Contributor
Author
|
CI failures here look unrelated to the Terraform bump:
Posted on behalf of @droopy4096 |
droopy4096
pushed a commit
that referenced
this pull request
Oct 15, 2026
## 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 #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 #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](https://claude.com/claude-code) --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
denisra
approved these changes
Oct 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #30516 to
release/2.29.Bumps the bundled Terraform binary to 1.16.6 (latest stable, released 2026-10-14) so all supported branches ship the same version. Previous pin: 1.14.5 across
install.go,install.sh,scripts/Dockerfile.base,dogfood/coder/Dockerfile,.github/actions/setup-tfand bothtestdataversion files.This is a minor version jump, so
maxTerraformVersionis raised to 1.16.9. Checksums and Nix SRI hashes come from HashiCorp'sterraform_1.16.6_SHA256SUMS.Not changed:
scripts/ironbank/hardening_manifest.yamlstill builds Terraform 1.14.5 from source (with a source tarball checksum). Iron Bank bumps have historically gone through separate PRs, so it is left for the Iron Bank owners.Verified with
go test ./provisioner/terraform/...on this branch.Opened by Superblink on behalf of @droopy4096.
Updated from 1.16.5 to 1.16.6 (adds an HTTP/2 resource-exhaustion fix). Branch name still says 1.16.5. Tests not re-run locally for 1.16.6, relying on CI.