ci(maintain-deploy): add SKIP_UPSTREAM_BRANCHES; skip mirrored sgl-project/sglang#23003#11
Merged
DavidBellamy merged 1 commit intollm360-mainfrom Apr 19, 2026
Conversation
…project#23003 Upstream PR sgl-project#23003 (fix/json-ib-device-passthrough) is superseded by #9 (fix/json-ib-device-passthrough-llm360-main), which mirrors the same 7-line patch on top of llm360-main. The upstream branch was based on sgl-project/sglang:main and line-drifts when merged into llm360-main — was triggering a merge conflict in every octopus run after the PR #10 decouple landed. Port harbor's SKIP_UPSTREAM_BRANCHES pattern: env var + jq `NOT_SKIPPED` filter applied to both UPSTREAM_PR_STATE/BRANCHES (cross-fork PRs on LLM360/sglang:llm360-main) and REAL_UPSTREAM_PR_STATE/BRANCHES (upstream sgl-project/sglang PRs). Removes the skipped branch cleanly from the state fingerprint too, so re-running doesn't see it as a pending change.
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
1 participant
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.
Port harbor's `SKIP_UPSTREAM_BRANCHES` pattern to sglang. Removes the repeat merge-conflict on the upstream branch `fix/json-ib-device-passthrough` now that its content was mirrored into deploy via #9.
Why
With PR #10 (decouple) in effect, the octopus now discovers open PRs on `sgl-project/sglang:main` with LLM360-owned heads. The very first such PR — sgl-project#23003 — has branch `fix/json-ib-device-passthrough` based on upstream `main`, so it line-drift-conflicts when merged onto `llm360-main`. That branch was already cherry-picked cleanly as #9 (`fix/json-ib-device-passthrough-llm360-main`), so re-merging the upstream branch is redundant.
What this does
Maintenance
The upstream PR sgl-project#23003 stays open to track landing in `sgl-project/sglang`. When it merges upstream (or gets closed), remove the entry from `SKIP_UPSTREAM_BRANCHES`.