ci(auto-sync): pause remote-fix schedule until v7 migration#3
Merged
Conversation
remote-fix is on go module path /v6, upstream/main is on /v7 (commit e50caba). The fork also carries 7 auth providers absent from upstream (codebuddy/copilot/cursor/gitlab/iflow/kilo/kiro). Auto-merge can no longer succeed via the conflict-resolution path; every daily run was either failing or re-opening an unresolvable PR (PR #1). Schedule is commented out; workflow_dispatch is preserved so a manual sync can still be triggered once the v7 migration lands: gh workflow run auto-sync-upstream.yml --repo conversun/CLIProxyAPIPlus auto-sync-upstream-copilot is unaffected; feat/copilot already merged upstream/main (commit 65aa351) and is on /v7.
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.
Why
PR #1 (auto-sync attempt against `remote-fix`) cannot be resolved as a routine sync. Underneath the 9 conflict markers:
Module path bump v6 → v7 (upstream `e50cabac`) — `remote-fix` declares `module .../v6`, upstream is on `/v7`. 380 files on `remote-fix` import `.../v6/...`. Resolving the conflict markers is necessary but not sufficient — `go build` will still break on the import paths.
Fork-only auth providers absent from upstream: `codebuddy`, `copilot`, `cursor`, `gitlab`, `iflow`, `kilo`, `kiro`. Each needs its imports rewritten to `/v7` and any upstream-removed dependencies handled.
Upstream added `internal/home/` (control-plane config + home auth + websocket session reuse).
`refactor(cliproxy): remove ClaudeCodeSessionAffinity` (`0dcb8bd7`) and related dispatch refactoring.
This is a planned migration, not a sync.
What this PR does
Comments out the `schedule` trigger on `auto-sync-upstream.yml` so the daily failure / PR-reopen cycle stops. Preserves `workflow_dispatch` so a sync can be manually triggered once the v7 migration lands:
```
gh workflow run auto-sync-upstream.yml --repo conversun/CLIProxyAPIPlus
```
What is NOT affected
Closed alongside
remote-fix) #1 closed with detailed analysis comment.