update to latest buildkit#442
Draft
gilescope wants to merge 143 commits into
Draft
Conversation
Signed-off-by: Giles Cope <gilescope@gmail.com>
Signed-off-by: Giles Cope <gilescope@gmail.com>
Signed-off-by: Giles Cope <gilescope@gmail.com>
Signed-off-by: Giles Cope <gilescope@gmail.com>
Signed-off-by: Giles Cope <gilescope@gmail.com>
|
| Branch | Total Count |
|---|---|
| main | 5557 |
| This PR | 5713 |
| Difference | +156 (2.81%) |
📁 Changes by file type:
| File Type | Change |
|---|---|
| Go files (.go) | ❌ +23 |
| Documentation (.md) | ➖ No change |
| Earthfiles | ✅ -30 |
Keep up the great work migrating from Earthly to Earthbuild! 🚀
💡 Tips for finding more occurrences
Run locally to see detailed breakdown:
./.github/scripts/count-earthly.shNote that the goal is not to reach 0.
There is anticipated to be at least some occurences of earthly in the source code due to backwards compatibility with config files and language constructs.
![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 repository references and URLs from the 'earthly' organization to 'EarthBuild' across documentation and build configurations. It also performs a significant update of Go dependencies, including upgrading gRPC to v1.80.0 and updating various containerd and Docker-related packages. A bug was identified in the buildkitd/Earthfile where a log message references an undefined variable ${BUILDKIT_BRANCH} instead of ${BUILDKIT_GIT_BRANCH}.
| echo "looking up branch $BUILDKIT_GIT_BRANCH"; \ | ||
| buildkit_sha1=$(git ls-remote --refs -q https://github.com/$BUILDKIT_GIT_ORG/buildkit.git "$BUILDKIT_GIT_BRANCH" | awk 'BEGIN { FS = "[ \t]+" } {print $1}'); \ | ||
| echo "pinning github.com/earthly/buildkit@${BUILDKIT_BRANCH} to reference git sha1: $buildkit_sha1"; \ | ||
| echo "pinning github.com/${BUILDKIT_GIT_ORG}/buildkit@${BUILDKIT_BRANCH} to reference git sha1: $buildkit_sha1"; \ |
There was a problem hiding this comment.
The variable ${BUILDKIT_BRANCH} is used in this log message, but the argument defined in this scope is BUILDKIT_GIT_BRANCH. This will result in an empty string being printed for the branch name in the logs. Since you are already modifying this line to parameterize the organization, you should also correct the branch variable name.
echo "pinning github.com/${BUILDKIT_GIT_ORG}/buildkit@${BUILDKIT_GIT_BRANCH} to reference git sha1: $buildkit_sha1"; \
Signed-off-by: Giles Cope <gilescope@gmail.com>
Signed-off-by: Giles Cope <gilescope@gmail.com>
Signed-off-by: Giles Cope <gilescope@gmail.com>
Signed-off-by: Giles Cope <gilescope@gmail.com>
Signed-off-by: Giles Cope <gilescope@gmail.com>
Alpine 3.22 moved iptables from /sbin to /usr/sbin. Signed-off-by: Giles Cope <gilescope@gmail.com>
- Update buildkit fork ref to f4ec24bc (includes GRPC_ENFORCE_ALPN_ENABLED=false) - Disable gRPC ALPN enforcement in earthly client and buildkitd entrypoint for backwards compat with older grpc-go during upgrade transition - Search /usr/sbin in addition to /sbin for iptables (Alpine 3.22 change) - Bump all CI EARTHLY_BUILDKIT_IMAGE refs to v0.8.17-fix.4 Signed-off-by: Giles Cope <gilescope@gmail.com>
gilescope
force-pushed
the
giles-update-latest-buildkit
branch
from
990ef27 to
c42959c
Compare
Older earth binaries pass EARTHLY_ADDITIONAL_BUILDKIT_CONFIG with the TOML section header and key on the same line (e.g. [registry."docker.io"] mirrors = [...]). The new buildkit's TOML parser requires a newline after section headers. Post-process the generated buildkitd.toml to split these. Signed-off-by: Giles Cope <gilescope@gmail.com>
Upstream buildkit added a strict verifier that rejects multiple refs without platform mapping. Earthly's multi-BUILD pattern legitimately produces this. The buildkit fork now downgrades this to a warning. Signed-off-by: Giles Cope <gilescope@gmail.com>
Signed-off-by: Giles Cope <gilescope@gmail.com>
Author
|
21 green CI jobs! It's a start. |
Signed-off-by: Giles Cope <gilescope@gmail.com>
Three concurrent Go compilations (buildkitd, ticktock-buildkitd, earthly) exceed the 16GB runner memory under Podman, causing OOM kills that manifest as silent cancellations. Signed-off-by: Giles Cope <gilescope@gmail.com>
The old SHA 88ecf5d6 is incompatible with the current codebase: missing client/llb/sourceresolver package and containerd API version conflicts. Point to the same buildkit fork commit (da92d3419) used by the main build. Signed-off-by: Giles Cope <gilescope@gmail.com>
Three concurrent Go compilations (buildkitd, buildctl, earthly) exceed runner memory under Podman. Limiting max-parallelism to 2 serialises the heaviest compilation steps, keeping peak memory within bounds. Signed-off-by: Giles Cope <gilescope@gmail.com>
The build-earthly parallelism fix only applied to the build step. Test jobs bootstrap their own buildkitd via stage2-setup, so they also need the parallelism limit to avoid OOM during Go compilations. Signed-off-by: Giles Cope <gilescope@gmail.com>
The earthly-next build is even heavier than normal (update-buildkit + two buildkitd variants + earthly). Apply max-parallelism=2 to prevent OOM on standard CI runners. Signed-off-by: Giles Cope <gilescope@gmail.com>
Move GCR mirror config and max-parallelism before bootstrap so buildkitd starts with the correct settings first time, avoiding a restart that may not pick up max-parallelism correctly. Signed-off-by: Giles Cope <gilescope@gmail.com>
Docker earthly-next tests also OOM with default parallelism of 20. Apply the limit for all CI builds, not just Podman/earthly-next. Signed-off-by: Giles Cope <gilescope@gmail.com>
…uildkit # Conflicts: # go.mod # go.sum
…uildkit # Conflicts: # go.mod # go.sum
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
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.
In for a penny, in for a pound.
This is pointing to EarthBuild/buildkit#14