Repository navigation
feat(runway): land GitHub stacks through the REST API - #807
Merged
Merged
Conversation
behinddwalls
marked this pull request as ready for review
October 7, 2026 20:26
behinddwalls
changed the title
behinddwalls
force-pushed
the
github-merger
branch
from
October 7, 2026 20:30
17e6b39 to
266a621
Compare
behinddwalls
added this pull request to stack #809
October 7, 2026 20:31
mnoah1
reviewed
Oct 7, 2026
behinddwalls
force-pushed
the
github-merger
branch
3 times, most recently
from
October 8, 2026 00:33
eb1684f to
a595fca
Compare
mnoah1
approved these changes
Oct 8, 2026
## Summary
### Why?
Runway can only merge through a local `git` checkout. On github.com we want GitHub to do the merge, so that branch rules, PR state and stack rebasing stay GitHub's, including for native stacked PRs.
### What?
- New `runway/extension/merger/github`: each step is one GitHub stack, landed atomically with `PUT /pulls/{top}/merge-async` and then polled.
- Lists that are not a GitHub stack based on the target are rejected at the mergeability check. `Merge` re-checks them before submitting.
- Outputs are each PR's merge commit, read from its `merged` issue event, since API 2026-03-10 nulls `merge_commit_sha`.
- Redelivery is safe: merged PRs are skipped, an in-flight request (409) is adopted, and a pending merge is retryable via `Classifier`.
- Auth comes from the injected `*http.Client`. Runway config gains `type: github`, and runway now classifies HTTP errors.
- Atomicity is per step, not per batch (see README).
## Test Plan
✅ `bazel test //runway/... //service/runway/...` against a fake GitHub, plus config and disposition tests
✅ API behaviour confirmed with probes against github.com
✅ `make lint check-gazelle check-tidy`
roychying
force-pushed
the
github-merger
branch
from
October 8, 2026 16:55
a595fca to
06b733d
Compare
Tmwakalasya
pushed a commit
to Tmwakalasya/submitqueue
that referenced
this pull request
Oct 8, 2026
…ts (uber#808) ## Summary ### Why? The merger's unit tests use a fake, which only encodes our reading of GitHub's docs. These suites check the merger, and SubmitQueue's whole land path, against real github.com on every CI run. ### What? - `TestGitHubLandE2E`: gateway → orchestrator (GitHub change provider) → Runway (GitHub merger). It lands a single PR and a stack, and rejects PRs that are not a stack. - Merger integration test: a full stack with redelivery, a partial stack, non-stack lists, and a moved head. - Shared `test/testutil/githubtestrepo` fixtures, which skip unless `SQ_GITHUB_TOKEN` and `SQ_GITHUB_TEST_REPO` are set. - CI: the `e2e` job and a new `merger-integration-test` job take the test repo from the `SQ_GITHUB_TEST_REPO` repository variable and its token from the `SQ_TEST_REPO_TOKEN` repository secret. The secrets guard allows it as the only exception. - `e2e-github-queue` is added to `queues.yaml` and to `MQ_TENANTS`. - Any contributor can use their own test repo, locally or in their fork's CI; `TESTING.md` lists what it needs. CI requires the token only where `SQ_GITHUB_TEST_REPO` is set. ## Test Plan ✅ `TestGitHubLandE2E` 3/3 and the merger integration test 4/4 against `behinddwalls/sq-demo`; no fixtures left behind ✅ `make lint check-gazelle check-tidy` ## Stack 1. uber#807 1. @ uber#808 🤖 Generated with [Claude Code](https://claude.com/claude-code)
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
3 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.
Summary
Why?
Runway can only merge through a local
gitcheckout. On github.com we want GitHub to do the merge, so that branch rules, PR state and stack rebasing stay GitHub's, including for native stacked PRs.What?
runway/extension/merger/github: each step is one GitHub stack, landed atomically withPUT /pulls/{top}/merge-asyncand then polled.Mergere-checks them before submitting.mergedissue event, since API 2026-03-10 nullsmerge_commit_sha.Classifier.*http.Client. Runway config gainstype: github, and runway now classifies HTTP errors.Test Plan
✅
bazel test //runway/... //service/runway/...against a fake GitHub, plus config and disposition tests✅ API behaviour confirmed with probes against github.com
✅
make lint check-gazelle check-tidyStack
🤖 Generated with Claude Code