Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
0bcdd8d8
Unverified
Commit
0bcdd8d8
authored
May 12, 2022
by
Casey Hillers
Committed by
GitHub
May 12, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[conductor] Fix branch version to use framework branch (#103381)
parent
1af8cc11
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
next.dart
dev/conductor/core/lib/src/next.dart
+2
-2
next_test.dart
dev/conductor/core/test/next_test.dart
+1
-0
No files found.
dev/conductor/core/lib/src/next.dart
View file @
0bcdd8d8
...
@@ -194,10 +194,10 @@ class NextContext extends Context {
...
@@ -194,10 +194,10 @@ class NextContext extends Context {
previousCheckoutLocation:
state
.
framework
.
checkoutPath
,
previousCheckoutLocation:
state
.
framework
.
checkoutPath
,
);
);
stdio
.
printStatus
(
'Writing candidate branch...'
);
stdio
.
printStatus
(
'Writing candidate branch...'
);
bool
needsCommit
=
await
framework
.
updateCandidateBranchVersion
(
state
.
releaseVersion
);
bool
needsCommit
=
await
framework
.
updateCandidateBranchVersion
(
state
.
framework
.
candidateBranch
);
if
(
needsCommit
)
{
if
(
needsCommit
)
{
final
String
revision
=
await
framework
.
commit
(
final
String
revision
=
await
framework
.
commit
(
'Create candidate branch version
${state.
engine
.candidateBranch}
for
${state.releaseChannel}
'
,
'Create candidate branch version
${state.
framework
.candidateBranch}
for
${state.releaseChannel}
'
,
addFirst:
true
,
addFirst:
true
,
);
);
// append to list of cherrypicks so we know a PR is required
// append to list of cherrypicks so we know a PR is required
...
...
dev/conductor/core/test/next_test.dart
View file @
0bcdd8d8
...
@@ -561,6 +561,7 @@ void main() {
...
@@ -561,6 +561,7 @@ void main() {
]);
]);
expect
(
processManager
,
hasNoRemainingExpectations
);
expect
(
processManager
,
hasNoRemainingExpectations
);
expect
(
stdio
.
stdout
,
contains
(
'release-candidate-branch.version containing
$candidateBranch
'
));
expect
(
stdio
.
stdout
,
contains
(
'Updating engine revision from
$oldEngineVersion
to
$revision1
'
));
expect
(
stdio
.
stdout
,
contains
(
'Updating engine revision from
$oldEngineVersion
to
$revision1
'
));
expect
(
stdio
.
stdout
,
contains
(
'Are you ready to push your framework branch'
));
expect
(
stdio
.
stdout
,
contains
(
'Are you ready to push your framework branch'
));
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment