[core] Fix react next patch and prevent regression #21482
Merged
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
eps1lon
commented
Jun 17, 2020
| await exec(`git apply ${path.resolve(__dirname, `./react-${distTag}.diff`)}`); | ||
| } catch (error) { | ||
| // ignore if the patch doesn't exist | ||
| if (error.code !== 128) { |
There was a problem hiding this comment.
This code is not necessarily tied to non-existing patches. It hid the error message that the patch was corrupted.
I don't remember why I added it. In the end we could always leave the patch empty on certain branches.
Details of bundle changes.Comparing: ff6bde2...d153ed0 Details of page changes
|
|
@eps1lon I recall using git diff to generate the diff, using git apply to test it. But it was the first time doing such. It's not unlikely I did one step wrong. |
|
When I say "test", I mean testing that the diff is applied, I didn't try to run the tests with the next version of React (I used the failing CI report instead). I haven't look into how to do such in my env yet. |
Weird. Because usually the compare range should be updated as well to reflect the compared commits. Anyway, in the future the CI failures should be more descriptive. Make sure to use |
|
Pinning the command, for later: REACT_DIST_TAG=next node scripts/use-react-dist-tag.js && yarn |
eps1lon
added a commit
to eps1lon/material-ui
that referenced
this pull request
Jun 18, 2020
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.
The patch probably broken in #21249. @oliviertassinari Did you create the new patch with
git diffor manually edit the diff?Will be forward ported to
nextonce merged.