Skip to content

chore: resolve remaining conflicts for upstream v0.13.2 sync - #33

Closed
janishorsts wants to merge 5 commits into
chore-merge-v0.13.2-vendorfrom
chore-merge-v0.13.2
Closed

janishorsts wants to merge 5 commits into
chore-merge-v0.13.2-vendorfrom
chore-merge-v0.13.2

Conversation

@janishorsts

Copy link
Copy Markdown

Third PR in stack: resolves all remaining merge conflicts, protobuf updates, Darwin/cross-compilation fixes, and sync reports for moby/buildkit v0.13.2.

@coderabbitai

coderabbitai Bot commented Oct 1, 2026

Copy link
Copy Markdown

Important

Draft PR not reviewed

Draft PRs are not automatically reviewed by default.

  • Trigger a manual review

To automatically review draft PRs, update your CodeRabbit configuration:

reviews:
  auto_review:
    drafts: true
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Autopilot is currently an internal CodeRabbit preview.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@janishorsts
janishorsts added this pull request to stack #34 October 1, 2026 17:31
@github-actions

github-actions Bot commented Oct 1, 2026 •

Copy link
Copy Markdown

🎉 Are we earthbuild yet?

Great progress! You've reduced "earthly" occurrences by 6 (2.76%)

📈 Overall Progress

Branch Total Count
main 217
This PR 211
Difference -6 (2.76%)

📁 Changes by file type:

File Type Change
Go files (.go) ✅ -6
Documentation (.md) ➖ No change
Earthfiles ➖ No change

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.sh

Note 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.

@janishorsts
janishorsts force-pushed the chore-merge-v0.13.2-vendor branch from 9da053a to 35fe3b6 Compare October 1, 2026 18:02
@janishorsts janishorsts closed this Oct 2, 2026
@janishorsts
janishorsts deleted the chore-merge-v0.13.2 branch October 2, 2026 07:04
@janishorsts
janishorsts removed this pull request from stack #34 October 2, 2026 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant