Skip to content

Recompile with gh-aw main: bundle transport for merge commits#274

Merged
mrjf merged 1 commit intomainfrom
fix/recompile-main-with-bundle-transport
May 5, 2026
Merged

Recompile with gh-aw main: bundle transport for merge commits#274
mrjf merged 1 commit intomainfrom
fix/recompile-main-with-bundle-transport

Conversation

@mrjf
Copy link
Copy Markdown
Contributor

@mrjf mrjf commented May 5, 2026

Summary

Recompile lock files with gh-aw main compiler, which includes the bundle transport fix (#30287). Action refs stay on gh-aw-actions/setup@v0.71.4 (dedicated repo).

Problem

Evergreen can't push merge commits via push_to_pull_request_branch because git am can't apply them. This blocks Evergreen from merging main into PR branches, causing an infinite retry loop.

Fix

gh-aw main (#30287) auto-detects merge commits in the push range and switches from git am to bundle transport, which handles merges correctly.

Test plan

  • Merge and verify Evergreen can merge main into a PR branch that's behind

🤖 Generated with Claude Code

Compiled with gh-aw main (v0.71.2-361) which includes #30287:
push_to_pull_request_branch auto-switches to bundle transport when
merge commits are detected, fixing the git-am failures that blocked
Evergreen from merging main into PR branches.

Action refs pinned to gh-aw-actions/setup@v0.71.4 (dedicated repo)
to avoid the monorepo subtree post-step cleanup issue.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@mrjf mrjf merged commit e17a9c5 into main May 5, 2026
12 checks passed
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