Docs/Tools/CI: Update references from master to trunk
#28433
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
|
Size Change: 0 B Total Size: 1.39 MB ℹ️ View Unchanged
|
gziolo
reviewed
Feb 4, 2021
packages/env/README.md
Outdated
| @@ -475,7 +475,7 @@ This is useful for plugin development when upstream Core changes need to be test | |||
|
|
|||
| ```json | |||
| { | |||
| "core": "WordPress/WordPress#master", | |||
| "core": "WordPress/WordPress#trunk", | |||
There was a problem hiding this comment.
There is no trunkbranch in the WordPress repository. It has to stay unchanged.
gziolo
added
the
[Type] Project Management
|
@ockham and @youknowriad – it touches release scripts, can you do sanity check? |
gziolo
reviewed
Feb 4, 2021
sarayourfriend
requested review from
ajitbohra,
chrisvanpatten,
karmatosed,
mapk,
nerrad,
noahtallen and
ntwb
as code owners
sarayourfriend
force-pushed
the
refactor/update-references-to-main-branch
branch
from
69e7b9c to
5577c94
Compare
|
Rebased and fixed the issue you spotted @gziolo, thanks. |
gziolo
approved these changes
Feb 4, 2021
sarayourfriend
force-pushed
the
refactor/update-references-to-main-branch
branch
from
5577c94 to
e6c9002
Compare
sarayourfriend
force-pushed
the
refactor/update-references-to-main-branch
branch
from
e6c9002 to
54c0a73
Compare
ockham
reviewed
Feb 25, 2021
changelog.txt
Outdated
| @@ -7659,7 +7659,7 @@ Add knobs to the [ColorIndicator Story](https://github.com/WordPress/gutenberg/p | |||
| * Fix keyboard interaction (up/down arrow keys) causing focus to transfer out of the default block’s insertion menu. | |||
| * Fix regression causing dynamic blocks not rendering in the frontend. | |||
| * Fix vertical alignment issue on Media & Text block. | |||
| * Fix some linter errors in master branch. | |||
| * Fix some linter errors in main branch. | |||
There was a problem hiding this comment.
Not sure if this is an oversight, or it's on purpose (because at the time, it wasn't called trunk?) 🤔 (If the latter, then we'd also need to change the other occurrences in the changelog, no?)
There was a problem hiding this comment.
I intentionally changed it to "main branch" to avoid ever having to change it again in the future, but that seems unlikely so I'll change it to be trunk explicitly.
|
One minor note here: #28433 (comment). Looking great overall -- thanks for taking care of this! |
sarayourfriend
force-pushed
the
refactor/update-references-to-main-branch
branch
from
b839911 to
1b7a155
Compare
|
@ockham Do you think we need to backport this to the release/10.1 branch (since it already branched for the RC), to make the scripts there work properly? |
youknowriad
reviewed
Mar 1, 2021
| @@ -121,7 +121,7 @@ function parseSourceString( sourceString, { workDirectoryPath } ) { | |||
| return { | |||
| type: 'git', | |||
| url: `https://github.com/${ gitHubFields[ 1 ] }/${ gitHubFields[ 2 ] }.git`, | |||
| ref: gitHubFields[ 5 ] || 'master', | |||
| ref: gitHubFields[ 5 ] || 'trunk', | |||
There was a problem hiding this comment.
This shouldn't be changed I think.
The |
sarayourfriend
force-pushed
the
refactor/update-references-to-main-branch
branch
from
bd6224d to
73ccaf4
Compare
youknowriad
pushed a commit
that referenced
this pull request
Mar 1, 2021
|
merged and cherry-picked this to release/10.1 |
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.
Should only be merged AFTER the main branch is renamed to
trunkAll the CI scripts are going to be broken for this PR because the
trunkbranch doesn't exist yet 😉Description
Update references from
mastertotrunkin:How has this been tested?
TBD
Types of changes
Non-breaking changes (renamed functions are all internal)
Checklist: