Visitar URL original
recompile protos + update to new format · flutter/flutter@9977568 · GitHub
Skip to content

Commit 9977568

Browse files
author
Casey Hillers
committed
recompile protos + update to new format
1 parent 2ac3e5e commit 9977568

10 files changed

Lines changed: 438 additions & 494 deletions

‎dev/conductor/core/lib/src/next.dart‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import 'proto/conductor_state.pb.dart' as pb;
1313
import 'proto/conductor_state.pbenum.dart';
1414
import 'repository.dart';
1515
import 'state.dart' as state_import;
16-
import 'state.dart';
1716

1817
const String kStateOption = 'state-file';
1918
const String kYesFlag = 'yes';
@@ -147,7 +146,7 @@ class NextContext extends Context {
147146
if (!autoAccept) {
148147
final bool response = await prompt(
149148
'Has CI passed for the engine PR?\n\n'
150-
'${luciConsoleLink(state.releaseChannel, 'engine')}'
149+
'${state_import.luciConsoleLink(state.releaseChannel, 'engine')}'
151150
);
152151
if (!response) {
153152
stdio.printError('Aborting command.');
@@ -188,10 +187,10 @@ class NextContext extends Context {
188187
addFirst: true,
189188
);
190189
// append to list of cherrypicks so we know a PR is required
191-
state.framework.cherrypicks.add(pb.Cherrypick(
192-
appliedRevision: revision,
193-
state: pb.CherrypickState.COMPLETED,
194-
));
190+
state.framework.cherrypicks.add(pb.Cherrypick.create()
191+
..appliedRevision = revision
192+
..state = pb.CherrypickState.COMPLETED
193+
);
195194
}
196195
stdio.printStatus('Rolling new engine hash $engineRevision to framework checkout...');
197196
needsCommit = await framework.updateEngineRevision(engineRevision);
@@ -201,10 +200,10 @@ class NextContext extends Context {
201200
addFirst: true,
202201
);
203202
// append to list of cherrypicks so we know a PR is required
204-
state.framework.cherrypicks.add(pb.Cherrypick(
205-
appliedRevision: revision,
206-
state: pb.CherrypickState.COMPLETED,
207-
));
203+
state.framework.cherrypicks.add(pb.Cherrypick.create()
204+
..appliedRevision = revision
205+
..state = pb.CherrypickState.COMPLETED
206+
);
208207
}
209208

210209
final List<pb.Cherrypick> unappliedCherrypicks = <pb.Cherrypick>[];

‎dev/conductor/core/lib/src/proto/conductor_state.pb.dart‎

Lines changed: 73 additions & 202 deletions
Large diffs are not rendered by default.

‎dev/conductor/core/lib/src/proto/conductor_state.pbenum.dart‎

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,37 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
///
5+
//
66
// Generated code. Do not modify.
77
// source: conductor_state.proto
88
//
99
// @dart = 2.12
10-
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
1110

12-
// ignore_for_file: UNDEFINED_SHOWN_NAME
11+
// ignore_for_file: annotate_overrides, camel_case_types
12+
// ignore_for_file: constant_identifier_names, library_prefixes
13+
// ignore_for_file: non_constant_identifier_names, prefer_final_fields
14+
// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
15+
1316
import 'dart:core' as $core;
17+
1418
import 'package:protobuf/protobuf.dart' as $pb;
1519

1620
class ReleasePhase extends $pb.ProtobufEnum {
1721
static const ReleasePhase APPLY_ENGINE_CHERRYPICKS =
18-
ReleasePhase._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'APPLY_ENGINE_CHERRYPICKS');
22+
ReleasePhase._(0, _omitEnumNames ? '' : 'APPLY_ENGINE_CHERRYPICKS');
1923
static const ReleasePhase CODESIGN_ENGINE_BINARIES =
20-
ReleasePhase._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CODESIGN_ENGINE_BINARIES');
21-
static const ReleasePhase APPLY_FRAMEWORK_CHERRYPICKS = ReleasePhase._(
22-
2, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'APPLY_FRAMEWORK_CHERRYPICKS');
23-
static const ReleasePhase PUBLISH_VERSION =
24-
ReleasePhase._(3, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'PUBLISH_VERSION');
25-
static const ReleasePhase PUBLISH_CHANNEL =
26-
ReleasePhase._(4, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'PUBLISH_CHANNEL');
27-
static const ReleasePhase VERIFY_RELEASE =
28-
ReleasePhase._(5, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'VERIFY_RELEASE');
29-
static const ReleasePhase RELEASE_COMPLETED =
30-
ReleasePhase._(6, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'RELEASE_COMPLETED');
24+
ReleasePhase._(1, _omitEnumNames ? '' : 'CODESIGN_ENGINE_BINARIES');
25+
static const ReleasePhase APPLY_FRAMEWORK_CHERRYPICKS =
26+
ReleasePhase._(2, _omitEnumNames ? '' : 'APPLY_FRAMEWORK_CHERRYPICKS');
27+
static const ReleasePhase PUBLISH_VERSION = ReleasePhase._(3, _omitEnumNames ? '' : 'PUBLISH_VERSION');
28+
static const ReleasePhase VERIFY_RELEASE = ReleasePhase._(5, _omitEnumNames ? '' : 'VERIFY_RELEASE');
29+
static const ReleasePhase RELEASE_COMPLETED = ReleasePhase._(6, _omitEnumNames ? '' : 'RELEASE_COMPLETED');
3130

3231
static const $core.List<ReleasePhase> values = <ReleasePhase>[
3332
APPLY_ENGINE_CHERRYPICKS,
3433
CODESIGN_ENGINE_BINARIES,
3534
APPLY_FRAMEWORK_CHERRYPICKS,
3635
PUBLISH_VERSION,
37-
PUBLISH_CHANNEL,
3836
VERIFY_RELEASE,
3937
RELEASE_COMPLETED,
4038
];
@@ -46,14 +44,11 @@ class ReleasePhase extends $pb.ProtobufEnum {
4644
}
4745

4846
class CherrypickState extends $pb.ProtobufEnum {
49-
static const CherrypickState PENDING =
50-
CherrypickState._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'PENDING');
47+
static const CherrypickState PENDING = CherrypickState._(0, _omitEnumNames ? '' : 'PENDING');
5148
static const CherrypickState PENDING_WITH_CONFLICT =
52-
CherrypickState._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'PENDING_WITH_CONFLICT');
53-
static const CherrypickState COMPLETED =
54-
CherrypickState._(2, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'COMPLETED');
55-
static const CherrypickState ABANDONED =
56-
CherrypickState._(3, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ABANDONED');
49+
CherrypickState._(1, _omitEnumNames ? '' : 'PENDING_WITH_CONFLICT');
50+
static const CherrypickState COMPLETED = CherrypickState._(2, _omitEnumNames ? '' : 'COMPLETED');
51+
static const CherrypickState ABANDONED = CherrypickState._(3, _omitEnumNames ? '' : 'ABANDONED');
5752

5853
static const $core.List<CherrypickState> values = <CherrypickState>[
5954
PENDING,
@@ -69,14 +64,10 @@ class CherrypickState extends $pb.ProtobufEnum {
6964
}
7065

7166
class ReleaseType extends $pb.ProtobufEnum {
72-
static const ReleaseType STABLE_INITIAL =
73-
ReleaseType._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'STABLE_INITIAL');
74-
static const ReleaseType STABLE_HOTFIX =
75-
ReleaseType._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'STABLE_HOTFIX');
76-
static const ReleaseType BETA_INITIAL =
77-
ReleaseType._(2, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'BETA_INITIAL');
78-
static const ReleaseType BETA_HOTFIX =
79-
ReleaseType._(3, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'BETA_HOTFIX');
67+
static const ReleaseType STABLE_INITIAL = ReleaseType._(0, _omitEnumNames ? '' : 'STABLE_INITIAL');
68+
static const ReleaseType STABLE_HOTFIX = ReleaseType._(1, _omitEnumNames ? '' : 'STABLE_HOTFIX');
69+
static const ReleaseType BETA_INITIAL = ReleaseType._(2, _omitEnumNames ? '' : 'BETA_INITIAL');
70+
static const ReleaseType BETA_HOTFIX = ReleaseType._(3, _omitEnumNames ? '' : 'BETA_HOTFIX');
8071

8172
static const $core.List<ReleaseType> values = <ReleaseType>[
8273
STABLE_INITIAL,
@@ -90,3 +81,5 @@ class ReleaseType extends $pb.ProtobufEnum {
9081

9182
const ReleaseType._($core.int v, $core.String n) : super(v, n);
9283
}
84+
85+
const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');

0 commit comments

Comments
 (0)