Prepare scripts for the master to main migration. (flutter/engine#29371)

It changes master branch with main to prepare for the migration.
This change will be landed in synchronization with changes to modify
 the engine default branch to main.

Bug: https://github.com/flutter/flutter/issues/90476
This commit is contained in:
godofredoc 2021-11-15 09:06:11 -08:00 committed by GitHub
parent d48f6de897
commit 720cd0baaa
3 changed files with 5 additions and 5 deletions

View File

@ -804,7 +804,7 @@ Future<String> _getDiffBaseRevision(ProcessManager processManager, Directory rep
if (upstreamUrl.isEmpty) {
upstream = 'origin';
}
await _runGit(<String>['fetch', upstream, 'master'], processRunner);
await _runGit(<String>['fetch', upstream, 'main'], processRunner);
String result = '';
try {
// This is the preferred command to use, but developer checkouts often do

View File

@ -18,7 +18,7 @@ class GitRepo {
List<io.File>? _changedFiles;
/// Returns a list of all non-deleted files which differ from the nearest
/// merge-base with `master`. If it can't find a fork point, uses the default
/// merge-base with `main`. If it can't find a fork point, uses the default
/// merge-base.
///
/// This is only computed once and cached. Subsequent invocations of the
@ -31,7 +31,7 @@ class GitRepo {
defaultWorkingDirectory: root,
);
final ProcessRunnerResult fetchResult = await processRunner.runProcess(
<String>['git', 'fetch', 'upstream', 'master'],
<String>['git', 'fetch', 'upstream', 'main'],
failOk: true,
);
if (fetchResult.exitCode != 0) {
@ -39,7 +39,7 @@ class GitRepo {
'git',
'fetch',
'origin',
'master',
'main',
]);
}
final Set<String> result = <String>{};

View File

@ -46,7 +46,7 @@ jazzy \
--author Flutter Team\
--author_url 'https://flutter.io'\
--github_url 'https://github.com/flutter'\
--github-file-prefix 'http://github.com/flutter/engine/blob/master'\
--github-file-prefix 'http://github.com/flutter/engine/blob/main'\
--module-version 1.0.0\
--xcodebuild-arguments --objc,"$FLUTTER_UMBRELLA_HEADER",--,-x,objective-c,-isysroot,"$(xcrun --show-sdk-path --sdk iphonesimulator)",-I,"$(pwd)"\
--module Flutter\