Sync only to the upstream branch and do not cherry-pick
#4864
Conversation
This file contains 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
mukilan
reviewed
Dec 16, 2024
| if [ $number_of_commits != '0' ]; then | ||
| step "Applying $number_of_commits new commits" | ||
| git -c user.email="$git_email" -c user.name="$git_name" cherry-pick $hash..filtered-upstream/master | ||
| git rev-parse filtered-upstream/master > "$hash_file" |
There was a problem hiding this comment.
We are no longer updating the hash_file, so is https://github.com/servo/webrender/blob/main/.github/sync/UPSTREAM_COMMIT still needed?
There was a problem hiding this comment.
Nope. It's not needed at all. I've removed it in the latest version of this branch.
Upstream sometimes uses merge commits which make it very difficult to maintain a cherry-pick based sync workflow. This change modifies the way syncing works so that it simply does a hard reset of the branch to the filtered repository. This should be more foolproof, with the downside that `main` is no longer up to date with upstream. Instead a new `upstream` branch is always up-to-date. Fixes #4861.
mrobinson
force-pushed
the
update-sync
branch
from
7166097 to
d9aaff4
Compare
mukilan
approved these changes
Dec 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Upstream sometimes uses merge commits which make it very difficult to
maintain a cherry-pick based sync workflow. This change modifies the way
syncing works so that it simply does a hard reset of the branch to the
filtered repository. This should be more foolproof, with the downside
that
mainis no longer up to date with upstream. Instead a newupstreambranch is always up-to-date.Fixes #4861.