Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docs/Tools/CI: Update references from master to trunk #28433

Merged
merged 4 commits into from
Mar 1, 2021
Merged

Docs/Tools/CI: Update references from master to trunk #28433

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26c6ea4
Tooling: Update references from `master` to `trunk` in CI and other t…
sarayourfriend Jan 22, 2021
88e6476
Undo incorrect branch name change
sarayourfriend Feb 4, 2021
1b7a155
Clean up new instances of `master`.
sarayourfriend Feb 25, 2021
73ccaf4
Revert to master for default wp-env source ref
sarayourfriend Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Revert to master for default wp-env source ref
  • Loading branch information
@sarayourfriend
sarayourfriend committed Mar 1, 2021
commit 73ccaf468f040b33b4f3c7421ecf3152db0ade92
2 changes: 1 addition & 1 deletion packages/env/lib/config/parse-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ function parseSourceString( sourceString, { workDirectoryPath } ) {
return {
type: 'git',
url: `https://github.com/${ gitHubFields[ 1 ] }/${ gitHubFields[ 2 ] }.git`,
ref: gitHubFields[ 5 ] || 'trunk',
ref: gitHubFields[ 5 ] || 'master',
path: path.resolve(
workDirectoryPath,
gitHubFields[ 2 ],
Expand Down
2 changes: 1 addition & 1 deletion packages/env/lib/config/test/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ describe( 'readConfig', () => {
{
type: 'git',
url: 'https://github.com/WordPress/gutenberg.git',
ref: 'trunk',
ref: 'master',
path: expect.stringMatching( /^\/.*gutenberg$/ ),
basename: 'gutenberg',
},
Expand Down