Skip to content

Commit 292c59d

Browse files
author
Dillon Nys
committed
Merge remote-tracking branch 'google/master' into feat/actions-config
2 parents fb1094b + ea1f0b4 commit 292c59d

35 files changed

+613
-260
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.github/workflows/dart.yml linguist-generated=true
2+
tool/ci.sh linguist-generated=true

.github/workflows/dart.yml

Lines changed: 50 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

analysis_options.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ linter:
3737
- constant_identifier_names
3838
- control_flow_in_finally
3939
- curly_braces_in_flow_control_structures
40+
- depend_on_referenced_packages
4041
- directives_ordering
4142
- empty_catches
4243
- empty_constructor_bodies
@@ -49,13 +50,17 @@ linter:
4950
- join_return_with_assignment
5051
- library_names
5152
- library_prefixes
53+
- library_private_types_in_public_api
5254
- lines_longer_than_80_chars
5355
- list_remove_unrelated_type
5456
- literal_only_boolean_expressions
5557
- missing_whitespace_between_adjacent_strings
5658
- no_duplicate_case_values
59+
- no_leading_underscores_for_library_prefixes
60+
- no_leading_underscores_for_local_identifiers
5761
- no_runtimeType_toString
5862
- non_constant_identifier_names
63+
- null_check_on_nullable_type_parameter
5964
- null_closures
6065
- omit_local_variable_types
6166
- only_throw_errors
@@ -93,20 +98,25 @@ linter:
9398
- prefer_void_to_null
9499
- provide_deprecation_message
95100
- recursive_getters
101+
- require_trailing_commas
96102
- slash_for_doc_comments
97103
- sort_pub_dependencies
104+
- sort_unnamed_constructors_first
98105
- test_types_in_equals
99106
- throw_in_finally
100107
- type_annotate_public_apis
101108
- type_init_formals
102109
- unawaited_futures
103110
- unnecessary_brace_in_string_interps
104111
- unnecessary_const
112+
- unnecessary_constructor_name
105113
- unnecessary_getters_setters
106114
- unnecessary_lambdas
115+
- unnecessary_late
107116
- unnecessary_new
108117
- unnecessary_null_aware_assignments
109118
- unnecessary_null_in_if_null_operators
119+
- unnecessary_nullable_for_final_variable_declarations
110120
- unnecessary_overrides
111121
- unnecessary_parenthesis
112122
- unnecessary_statements
@@ -117,5 +127,6 @@ linter:
117127
- use_is_even_rather_than_modulo
118128
- use_rethrow_when_possible
119129
- use_string_buffers
130+
- use_super_parameters
120131
- valid_regexps
121132
- void_checks

mono_repo/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
## 6.3.0-dev
22

33
- Update to `subosito/flutter-action@v2.4.0`.
4+
- Require at least Dart >= 2.17.0
5+
- Add the `list` command.
46

57
## 6.2.2
68

mono_repo/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Global options:
3434
Available commands:
3535
check Check the state of the repository.
3636
generate Generates the CI configuration for child packages.
37+
list List all packages configured for mono_repo.
3738
presubmit Run the CI presubmits locally.
3839
pub Runs the `pub` command with the provided arguments across all packages.
3940

mono_repo/build.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ targets:
1313
options:
1414
any_map: true
1515
checked: true
16+
source_gen:combining_builder:
17+
options:
18+
ignore_for_file:
19+
- require_trailing_commas

mono_repo/lib/src/commands/github/github_yaml.dart

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ Map<String, String> generateGitHubYml(
2929

3030
final allJobStages = {for (var job in jobs) job.stageName};
3131
final orderedStages = calculateOrderedStages(
32-
rootConfig, rootConfig.monoConfig.githubConditionalStages)
33-
..add(_onCompletionStage);
32+
rootConfig,
33+
rootConfig.monoConfig.githubConditionalStages,
34+
)..add(_onCompletionStage);
3435

3536
final output = <String, String>{};
3637

@@ -203,24 +204,26 @@ Iterable<_MapEntryWithStage> _listJobs(
203204
if (mergeStages.contains(first.job.stageName)) {
204205
final packages = entry.value.map((t) => t.job.package).toList()..sort();
205206
yield jobEntry(
206-
first.jobYaml(
207+
first.jobYaml(
208+
rootConfig,
209+
packages: packages,
210+
oneOs: differentOperatingSystems.length == 1,
211+
oneSdk: differentSdks.length == 1,
212+
onePackage: differentPackages.length == 1,
213+
),
214+
first.job.stageName,
215+
);
216+
} else {
217+
yield* entry.value.map(
218+
(e) => jobEntry(
219+
e.jobYaml(
207220
rootConfig,
208-
packages: packages,
209221
oneOs: differentOperatingSystems.length == 1,
210222
oneSdk: differentSdks.length == 1,
211223
onePackage: differentPackages.length == 1,
212224
),
213-
first.job.stageName);
214-
} else {
215-
yield* entry.value.map(
216-
(e) => jobEntry(
217-
e.jobYaml(
218-
rootConfig,
219-
oneOs: differentOperatingSystems.length == 1,
220-
oneSdk: differentSdks.length == 1,
221-
onePackage: differentPackages.length == 1,
222-
),
223-
e.job.stageName),
225+
e.job.stageName,
226+
),
224227
);
225228
}
226229
}
@@ -229,9 +232,12 @@ Iterable<_MapEntryWithStage> _listJobs(
229232
// appropriate `needs` config to each.
230233
if (onCompletionJobs != null && onCompletionJobs.isNotEmpty) {
231234
for (var jobConfig in onCompletionJobs) {
232-
yield jobEntry({
233-
...jobConfig,
234-
}, _onCompletionStage);
235+
yield jobEntry(
236+
{
237+
...jobConfig,
238+
},
239+
_onCompletionStage,
240+
);
235241
}
236242
}
237243
}

0 commit comments

Comments
 (0)