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
30efcf40
Unverified
Commit
30efcf40
authored
Sep 21, 2022
by
Xilai Zhang
Committed by
GitHub
Sep 21, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_conductor] Conductor should stop mirroring beta releases to dev (#100716)
parent
df1163de
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
34 deletions
+18
-34
globals.dart
dev/conductor/core/lib/src/globals.dart
+0
-4
next.dart
dev/conductor/core/lib/src/next.dart
+18
-24
next_test.dart
dev/conductor/core/test/next_test.dart
+0
-6
No files found.
dev/conductor/core/lib/src/globals.dart
View file @
30efcf40
...
...
@@ -41,10 +41,6 @@ final RegExp releaseCandidateBranchRegex = RegExp(
r'flutter-(\d+)\.(\d+)-candidate\.(\d+)'
,
);
/// Whether all releases published to the beta channel should be mirrored to
/// dev.
const
bool
kSynchronizeDevWithBeta
=
true
;
/// Cast a dynamic to String and trim.
String
stdoutToString
(
dynamic
input
)
{
final
String
str
=
input
as
String
;
...
...
dev/conductor/core/lib/src/next.dart
View file @
30efcf40
...
...
@@ -48,7 +48,7 @@ class NextCommand extends Command<void> {
String
get
description
=>
'Proceed to the next release phase.'
;
@override
Future
<
void
>
run
()
{
Future
<
void
>
run
()
async
{
final
File
stateFile
=
checkouts
.
fileSystem
.
file
(
argResults
![
kStateOption
]);
if
(!
stateFile
.
existsSync
())
{
throw
ConductorException
(
...
...
@@ -57,7 +57,7 @@ class NextCommand extends Command<void> {
}
final
pb
.
ConductorState
state
=
state_import
.
readStateFromFile
(
stateFile
);
return
NextContext
(
await
NextContext
(
autoAccept:
argResults
![
kYesFlag
]
as
bool
,
checkouts:
checkouts
,
force:
argResults
![
kForceFlag
]
as
bool
,
...
...
@@ -302,37 +302,31 @@ class NextContext extends Context {
previousCheckoutLocation:
state
.
framework
.
checkoutPath
,
);
final
String
headRevision
=
await
framework
.
reverseParse
(
'HEAD'
);
final
List
<
String
>
releaseRefs
=
<
String
>[
state
.
releaseChannel
];
if
(
kSynchronizeDevWithBeta
&&
state
.
releaseChannel
==
'beta'
)
{
releaseRefs
.
add
(
'dev'
);
}
for
(
final
String
releaseRef
in
releaseRefs
)
{
if
(
autoAccept
==
false
)
{
// dryRun: true means print out git command
await
framework
.
pushRef
(
if
(
autoAccept
==
false
)
{
// dryRun: true means print out git command
await
framework
.
pushRef
(
fromRef:
headRevision
,
toRef:
releaseRef
,
toRef:
state
.
releaseChannel
,
remote:
state
.
framework
.
upstream
.
url
,
force:
force
,
dryRun:
true
,
);
);
final
bool
response
=
await
prompt
(
'Are you ready to publish version
${state.releaseVersion}
to
$releaseRef
?'
,
);
if
(!
response
)
{
stdio
.
printError
(
'Aborting command.'
);
updateState
(
state
,
stdio
.
logs
);
return
;
}
final
bool
response
=
await
prompt
(
'Are you ready to publish version
${state.releaseVersion}
to
${state.releaseChannel}
?'
,
);
if
(!
response
)
{
stdio
.
printError
(
'Aborting command.'
);
updateState
(
state
,
stdio
.
logs
);
return
;
}
await
framework
.
pushRef
(
}
await
framework
.
pushRef
(
fromRef:
headRevision
,
toRef:
releaseRef
,
toRef:
state
.
releaseChannel
,
remote:
state
.
framework
.
upstream
.
url
,
force:
force
,
);
}
);
break
;
case
pb
.
ReleasePhase
.
VERIFY_RELEASE
:
stdio
.
printStatus
(
...
...
dev/conductor/core/test/next_test.dart
View file @
30efcf40
...
...
@@ -943,8 +943,6 @@ void main() {
});
test
(
'updates currentPhase if user responds yes'
,
()
async
{
stdio
.
stdin
.
add
(
'y'
);
// for kSynchronizeDevWithBeta
stdio
.
stdin
.
add
(
'y'
);
final
FakeProcessManager
processManager
=
FakeProcessManager
.
list
(<
FakeCommand
>[
const
FakeCommand
(
...
...
@@ -960,10 +958,6 @@ void main() {
const
FakeCommand
(
command:
<
String
>[
'git'
,
'push'
,
FrameworkRepository
.
defaultUpstream
,
'
$revision1
:
$releaseChannel
'
],
),
// for kSynchronizeDevWithBeta
const
FakeCommand
(
command:
<
String
>[
'git'
,
'push'
,
FrameworkRepository
.
defaultUpstream
,
'
$revision1
:dev'
],
),
]);
writeStateToFile
(
fileSystem
.
file
(
stateFile
),
...
...
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