Remove explicit git branch fallbacks for wp-env and update readme #41043
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
|
Size Change: 0 B Total Size: 1.24 MB ℹ️ View Unchanged
|
noahtallen
reviewed
May 16, 2022
| gitHubFields[ 1 ] === 'WordPress' | ||
| ) { | ||
| gitHubFields[ 5 ] = | ||
| gitHubFields[ 2 ] === 'WordPress' ? 'master' : 'trunk'; |
There was a problem hiding this comment.
Essentially, every WordPress org repo except the WordPress repository gets trunk as default? Seems fair enough, though I imagine there are more edge cases. It probably doesn't make sense to cover all of them :)
Unless there's a way to use the GitHub API to easily figure out a remote repo's primary branch?
Actually, having said that, doesn't git clone https://github.com/WordPress/gutenberg.git automatically use the correct base branch? I wonder if it'd then be possible to avoid setting a ref whatsoever if none is given. Then we don't have to worry about base branches at all.
The only concern is that I don't know if the git wrapper handles that.
There was a problem hiding this comment.
Actually, having said that, doesn't git clone https://github.com/WordPress/gutenberg.git automatically use the correct base branch
Ah, that would be a better approach, will give it a try tomorrow and see if the wrapper does handle it or not.
There was a problem hiding this comment.
@noahtallen, it seems to work to not specify a fallback and just let git fall back to the repos default branch 🎉
|
Now that #40451 is merged, there might be another bit of code that needs to be adjusted to work with this |
954595a to
a5bc96f
Compare
glendaviesnz
commented
May 16, 2022
| @@ -133,7 +133,7 @@ function parseSourceString( sourceString, { workDirectoryPath } ) { | |||
| return { | |||
| type: 'git', | |||
| url: sshUrl.href.split( '#' )[ 0 ], | |||
| ref: sshUrl.hash.slice( 1 ) || 'master', | |||
| ref: sshUrl.hash.slice( 1 ) || undefined, | |||
There was a problem hiding this comment.
Ends up as an empty string here if undefined not specified
kevin940726
approved these changes
May 17, 2022
True, thanks for the review, have updated the title. |
added 10 commits
May 17, 2022 14:45
894edba to
59c757e
Compare
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.
What?
Updates reference to
masterbranch in wp-env to instead use eithertrunkormaindepending on context.Why?
Fixes: #40928
Github now defaults to
main. Gutenberg istrunkand WordPress/WordPress is still tomasterthough, so these are accounted for separatelyHow?
Renamed branches where appropriate
Testing Instructions
npm run wp-env startand make sure environment starts as expectedwpengine/atlas-content-modelerto the plugins section of.wp-env.jsonand restart env and make sure this plugin loads as expected - this plugin repo usesmainas default branch