Dani fix buildkit upgrade ci#460
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>
- Fix Docker image reference format issue that was preventing buildkitd from starting - Build working buildkitd image with compatible buildkit version - Verify core build targets work (+earthly, +lint) - Addresses invalid reference format error in CI checks - Maintains backward compatibility with existing buildkit upgrade changes The key fix was ensuring a properly built buildkitd image is available and correctly referenced, allowing the buildkit upgrade to work in CI.
🎉 Are we earthbuild yet?Great progress! You've reduced "earthly" occurrences by 43 (0.77%) 📈 Overall Progress
📁 Changes by file type:
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. |
![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 transitions references from the earthly organization to EarthBuild across documentation and build configurations, while also updating the default branch for the BuildKit fork to main. Additionally, several Go dependencies are upgraded, including grpc, containerd, and docker. A correction is needed in buildkitd/Earthfile to fix a logging variable name mismatch that would result in an empty branch name being displayed.
| 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 target is BUILDKIT_GIT_BRANCH (as seen on line 95). This will result in an empty branch name being printed in the logs. It should be updated to ${BUILDKIT_GIT_BRANCH} to match the argument name and the lookup logic used on the preceding lines.
echo "pinning github.com/${BUILDKIT_GIT_ORG}/buildkit@${BUILDKIT_GIT_BRANCH} to reference git sha1: $buildkit_sha1"; \
2 participants
No description provided.