build: bake version.Package as github.com/EarthBuild/buildkit#18
Merged
Conversation
The buildkitd/buildctl ldflags set version.Package to the legacy github.com/earthly/buildkit. EarthBuild's earthly client compares the buildkit daemon's reported package against github.com/EarthBuild/buildkit and warns "Using a non-EarthBuild version of Buildkit is not supported" on every invocation. Report the current org so our own buildkit is recognised as supported. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request updates the EARTHLY_PKG build argument in the Dockerfile, changing the repository path from github.com/earthly/buildkit to github.com/EarthBuild/buildkit. There are no review comments, and I have no feedback to provide.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
kmannislands
added a commit
to EarthBuild/earthbuild
that referenced
this pull request
Jun 17, 2026
Point buildkitd/Earthfile and the go.mod replace at EarthBuild/buildkit commit 24dff63d2728, which bakes version.Package as github.com/EarthBuild/buildkit instead of the legacy github.com/earthly/buildkit. This stops release binaries from warning "Using a non-EarthBuild version of Buildkit is not supported" on every run, since the daemon's reported package now matches the buildkitPackage constant in buildkitd/buildkitd.go. Fork change: EarthBuild/buildkit#18 go.sum also drops stale unused entries as a side effect of go mod tidy. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
➖ Are we earthbuild yet?No change in "earthly" occurrences 📈 Overall Progress
Keep up the great work migrating from Earthly to Earthbuild! 🚀 💡 Tips for finding more occurrencesRun locally to see detailed breakdown: ./.github/scripts/count-earthly.shNote that the goal is not to reach 0. |
janishorsts
approved these changes
Jun 17, 2026
kmannislands
added a commit
to EarthBuild/earthbuild
that referenced
this pull request
Jun 17, 2026
Point buildkitd/Earthfile and the go.mod replace at EarthBuild/buildkit main commit 51fe8fb974fd, which bakes version.Package as github.com/EarthBuild/buildkit instead of the legacy github.com/earthly/buildkit. This stops release binaries from warning "Using a non-EarthBuild version of Buildkit is not supported" on every run, since the daemon's reported package now matches the buildkitPackage constant in buildkitd/buildkitd.go. Fork change: EarthBuild/buildkit#18 (merged to main). go.sum also drops stale unused entries as a side effect of go mod tidy. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
kmannislands
added a commit
to EarthBuild/earthbuild
that referenced
this pull request
Jun 23, 2026
Point buildkitd/Earthfile and the go.mod replace at EarthBuild/buildkit main commit 51fe8fb974fd, which bakes version.Package as github.com/EarthBuild/buildkit instead of the legacy github.com/earthly/buildkit. This stops release binaries from warning "Using a non-EarthBuild version of Buildkit is not supported" on every run, since the daemon's reported package now matches the buildkitPackage constant in buildkitd/buildkitd.go. Fork change: EarthBuild/buildkit#18 (merged to main). go.sum also drops stale unused entries as a side effect of go mod tidy. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
kmannislands
added a commit
to EarthBuild/earthbuild
that referenced
this pull request
Jun 25, 2026
* build: forward release metadata args through all-binaries to +earthly The release pipeline (release+signed-release) passes --VERSION, --DEFAULT_BUILDKITD_IMAGE and --DEFAULT_INSTALLATION_NAME to the +all-binaries target via COPY. Those COPY-scoped args were never declared or forwarded by all-binaries or the per-platform earthly-<os>-<arch> targets, so they stopped there and +earthly fell back to its dev defaults. VERSION happened to still be correct because CI also passes it on the earthly CLI (which propagates globally to every matching ARG), but DEFAULT_BUILDKITD_IMAGE and DEFAULT_INSTALLATION_NAME are only passed via COPY. As a result release binaries baked in a buildkit image of $IMAGE_REGISTRY:buildkitd-$VERSION (ghcr.io/earthbuild/earthbuild:...) instead of docker.io/earthbuild/buildkitd:$VERSION -- the source of the "wrong buildkit version" warning. Declare these args (mirroring +earthly's own defaults) and forward them explicitly so callers can set them once and have them reach the binary. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * ci: upload release binaries before the smoke test The smoke test gated the artifact upload, so any smoke-test failure meant no binaries were uploaded and there was nothing to download for debugging. Run the upload first; the smoke test still fails the job, but the binaries are preserved as an artifact regardless. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * ci: fix buildkit-image smoke test for urfave/cli v3 and improve debugging The smoke test grepped for the literal "--buildkit-image value", but after the upgrade to urfave/cli v3 the flag renders as "--buildkit-image string" (v3 uses the type name as the placeholder, v2 used "value"). The grep matched nothing, so the test always failed at the first check with "Failed to find --buildkit-image flag" -- before ever comparing the image. This had been failing every staging release on main. Match on the flag name only so the check is robust to the placeholder token, and on failure print the binary version and full --help output (and use ::error:: annotations) to make diagnosis easier next time. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * build: bump buildkit fork to report EarthBuild package Point buildkitd/Earthfile and the go.mod replace at EarthBuild/buildkit main commit 51fe8fb974fd, which bakes version.Package as github.com/EarthBuild/buildkit instead of the legacy github.com/earthly/buildkit. This stops release binaries from warning "Using a non-EarthBuild version of Buildkit is not supported" on every run, since the daemon's reported package now matches the buildkitPackage constant in buildkitd/buildkitd.go. Fork change: EarthBuild/buildkit#18 (merged to main). go.sum also drops stale unused entries as a side effect of go mod tidy. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * chore: update stale earthly/buildkit references to EarthBuild Comments, log messages, ticktock BUILDKIT_PROJECT and the cache-from hint still pointed at the old earthly org. No functional change to the release path. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * build: bake the release buildkitd with the semver VERSION The shipped buildkitd (built by release+perform-release-buildkitd-dockerhub) baked its version from --TAG=$RELEASE_TAG (the short git sha), while the earthly client ships the semver VERSION (vX.Y.Z-<sha>). The local-buildkit check requires an exact match, so every release binary warned: Warning: Buildkit version (<sha>) is different from earth version (vX.Y.Z-<sha>) This was previously hidden behind the "non-EarthBuild buildkit" package warning, which is now fixed. Decouple the buildkitd binary's RELEASE_VERSION from its image TAG: the image tag stays keyed on RELEASE_TAG (so copy-staging-buildkitd-to-dockerhub still finds it), but the baked version is the semver VERSION. The release job already has VERSION available (no extra build cost -- this buildkitd is already rebuilt here with TAG=RELEASE_TAG). RELEASE_VERSION defaults to TAG so all other callers are unchanged. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
gilescope
added a commit
that referenced
this pull request
Jun 30, 2026
Resolves the Dockerfile version-baking conflict: keep the branch's worktree-aware heredoc block (skips version check for git worktrees, sets dev stubs) and apply main's rebrand from #18 (EARTHLY_PKG github.com/earthly/buildkit -> github.com/EarthBuild/buildkit).
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes EarthBuild/earthbuild#437
Problem
The buildkitd/buildctl ldflags bake
version.Packageas the legacygithub.com/earthly/buildkit:EarthBuild's earthly client compares the buildkit daemon's reported package against
github.com/EarthBuild/buildkit(case-insensitively) and, on mismatch, warns on every invocation:Fix
Set
EARTHLY_PKG=github.com/EarthBuild/buildkitin thebuildkit-versionstage of the Dockerfile (the single source consumed by both thebuildctlandbuildkitdbuild stages, and by the Earthfile+buildtarget viaFROM DOCKERFILE --target buildkit-linux).Verification
Built
--target buildkit-linuxlocally and confirmed:🤖 Generated with Claude Code