firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[flutter_conductor] Fix conductor start branch point (#100170)

Browse Source
This commit is contained in:
Christopher Fujino 2022-03-15 19:20:17 -07:00 committed by GitHub
parent 6f6b5647f5
commit 7a60b6eea6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dev/conductor/core/lib/src/start.dart
View File

@ -397,7 +397,10 @@ class StartContext extends Context {
));
final String frameworkHead = await framework.reverseParse('HEAD');
final String branchPoint = await framework.branchPoint(candidateBranch, FrameworkRepository.defaultBranch);
final String branchPoint = await framework.branchPoint(
'${framework.upstreamRemote.name}/$candidateBranch',
'${framework.upstreamRemote.name}/${FrameworkRepository.defaultBranch}',
);
final bool atBranchPoint = branchPoint == frameworkHead;
final ReleaseType releaseType = computeReleaseType(lastVersion, atBranchPoint);

10
dev/conductor/core/test/start_test.dart
View File

@ -277,7 +277,7 @@ void main() {
stdout: revision3,
),
const FakeCommand(
command: <String>['git', 'merge-base', candidateBranch, 'master'],
command: <String>['git', 'merge-base', 'upstream/$candidateBranch', 'upstream/master'],
stdout: branchPointRevision,
),
// check if commit is tagged, zero exit code means it is tagged
@ -465,7 +465,7 @@ void main() {
stdout: revision3,
),
const FakeCommand(
command: <String>['git', 'merge-base', candidateBranch, 'master'],
command: <String>['git', 'merge-base', 'upstream/$candidateBranch', 'upstream/master'],
stdout: branchPointRevision,
),
];
@ -639,7 +639,7 @@ void main() {
stdout: revision3,
),
const FakeCommand(
command: <String>['git', 'merge-base', candidateBranch, 'master'],
command: <String>['git', 'merge-base', 'upstream/$candidateBranch', 'upstream/master'],
stdout: branchPointRevision,
),
// check if commit is tagged, 0 exit code means it is tagged
@ -826,7 +826,7 @@ void main() {
stdout: revision3,
),
const FakeCommand(
command: <String>['git', 'merge-base', candidateBranch, 'master'],
command: <String>['git', 'merge-base', 'upstream/$candidateBranch', 'upstream/master'],
stdout: branchPointRevision,
),
// check if commit is tagged, 0 exit code thus it is tagged
@ -1014,7 +1014,7 @@ void main() {
stdout: branchPointRevision,
),
const FakeCommand(
command: <String>['git', 'merge-base', candidateBranch, 'master'],
command: <String>['git', 'merge-base', 'upstream/$candidateBranch', 'upstream/master'],
stdout: branchPointRevision,
),
// check if commit is tagged