fix(ci): force-fetch upstream tags in Upstream Sync#30
Merged
Conversation
After fixing the auth issue (#29), the workflow failed at the next step with: ! [rejected] v0.6.40 -> v0.6.40 (would clobber existing tag) This fork carries legacy tags inherited from when it was created. At least one of them (v0.6.40) points to a different commit than upstream's tag of the same name, so `git fetch --tags` refuses the overwrite by default. We always want upstream's tag values when resolving the sync target, so `--force` is the right behavior. `--prune` is kept but does NOT prune tags (no --prune-tags), so any flex-only tags are safe.
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.
Summary
Second fix after #29 unblocked auth. The next workflow run got past checkout but failed at `git fetch upstream --tags --prune` with:
```
! [rejected] v0.6.40 -> v0.6.40 (would clobber existing tag)
```
This fork carries legacy tags from when it was created. At least `v0.6.40` points to a different commit than upstream's `v0.6.40`, so `git fetch --tags` refuses the overwrite by default.
We always want upstream's tag values when resolving the sync target, so `--force` is correct. `--prune` is kept but is not `--prune-tags`, so any flex-only tags remain untouched.
Test plan