Skip to content

Commit 11c4b3c

Browse files
authored
Re-enable sdk-analyzer job, but make it not failing (#2864)
1 parent 165e097 commit 11c4b3c

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.github/workflows/test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
os: [ubuntu-latest]
2222
sdk: [dev, stable]
23-
job: [main, flutter, packages, sdk-docs]
23+
job: [main, flutter, sdk-analyzer, packages, sdk-docs]
2424
include:
2525
- os: macos-latest
2626
sdk: dev
@@ -34,8 +34,8 @@ jobs:
3434
# results.
3535
- sdk: stable
3636
job: flutter
37-
#- sdk: stable
38-
# job: sdk-analyzer
37+
- sdk: stable
38+
job: sdk-analyzer
3939
- sdk: stable
4040
job: sdk-docs
4141

analysis_options.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ analyzer:
2020
linter:
2121
rules:
2222
always_declare_return_types: true
23-
annotate_overrides: true
2423
avoid_dynamic_calls: true
2524
avoid_single_cascade_in_expression_statements: true
2625
avoid_unused_constructor_parameters: true

analysis_options_presubmit.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ analyzer:
2323
linter:
2424
rules:
2525
always_declare_return_types: true
26-
annotate_overrides: true
2726
avoid_dynamic_calls: true
2827
avoid_single_cascade_in_expression_statements: true
2928
avoid_unused_constructor_parameters: true

tool/grind.dart

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,15 @@ Future<void> testWithAnalyzerSdk() async {
544544
var sdkDartdoc = await createSdkDartdoc();
545545
var defaultGrindParameter =
546546
Platform.environment['DARTDOC_GRIND_STEP'] ?? 'test';
547-
await launcher.runStreamed(
548-
sdkBin('pub'), ['run', 'grinder', defaultGrindParameter],
549-
workingDirectory: sdkDartdoc);
547+
// TODO(srawlins): Re-enable sdk-analyzer when dart_style is published using
548+
// analyzer 3.0.0.
549+
try {
550+
await launcher.runStreamed(
551+
sdkBin('pub'), ['run', 'grinder', defaultGrindParameter],
552+
workingDirectory: sdkDartdoc);
553+
} catch (e, st) {
554+
print('Warning: SDK analyzer job threw "$e":\n$st');
555+
}
550556
}
551557

552558
Future<List<Map<Object, Object>>> _buildSdkDocs(

0 commit comments

Comments
 (0)