zbobr_fix-61-sync-fork#344
Open
milyin wants to merge 7 commits into
Open
Conversation
Adds `auto_sync_fork: bool` (default: true) to ZbobrRepoBackendGithubConfig and a `maybe_sync_fork` method that calls GitHub's merge-upstream API to bring a fork's branch in sync with upstream before each `git fetch origin`. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
When auto_sync_fork is enabled and merge-upstream fails, the error is now returned to the caller instead of being downgraded to a warning. This ensures the backend does not silently continue with stale fork refs. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…gration test env Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Tests cover: 1. auto_sync_fork=false skips all HTTP calls 2. Non-fork repos skip merge-upstream API calls 3. Fork repos call merge-upstream and return Ok 4. Merge-upstream HTTP errors are properly propagated All tests use wiremock to mock the GitHub API and verify correct behavior. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.
Resolves milyin-zenoh-zbobr/tasks#61