From f2dcbc1995cca24d16539e89afa62c29551d5471 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Tue, 14 Dec 2021 08:41:38 -0800
Subject: [PATCH 1/3] Remove extra annotate_overrides; its included in
 recommended.yaml

---
 analysis_options.yaml           | 1 -
 analysis_options_presubmit.yaml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index 14a16b1baf..3096bb152d 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -20,7 +20,6 @@ analyzer:
 linter:
   rules:
     always_declare_return_types: true
-    annotate_overrides: true
     avoid_dynamic_calls: true
     avoid_single_cascade_in_expression_statements: true
     avoid_unused_constructor_parameters: true
diff --git a/analysis_options_presubmit.yaml b/analysis_options_presubmit.yaml
index 697b4fc481..df4b78d7e4 100644
--- a/analysis_options_presubmit.yaml
+++ b/analysis_options_presubmit.yaml
@@ -23,7 +23,6 @@ analyzer:
 linter:
   rules:
     always_declare_return_types: true
-    annotate_overrides: true
     avoid_dynamic_calls: true
     avoid_single_cascade_in_expression_statements: true
     avoid_unused_constructor_parameters: true

From ce841f3079af5411a22d642557d9a80967025dcd Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Tue, 14 Dec 2021 08:46:57 -0800
Subject: [PATCH 2/3] Re-enable zombie sdk-analyzer, but catch failures

---
 .github/workflows/test.yaml |  6 +++---
 tool/grind.dart             | 12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2f97301c04..4fa5cc00ae 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         sdk: [dev, stable]
-        job: [main, flutter, packages, sdk-docs]
+        job: [main, flutter, sdk-analyzer, packages, sdk-docs]
         include:
           - os: macos-latest
             sdk: dev
@@ -34,8 +34,8 @@ jobs:
             # results.
           - sdk: stable
             job: flutter
-            #- sdk: stable
-            #  job: sdk-analyzer
+            - sdk: stable
+              job: sdk-analyzer
           - sdk: stable
             job: sdk-docs
 
diff --git a/tool/grind.dart b/tool/grind.dart
index f52943ee48..bd94c7fef1 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -544,9 +544,15 @@ Future<void> testWithAnalyzerSdk() async {
   var sdkDartdoc = await createSdkDartdoc();
   var defaultGrindParameter =
       Platform.environment['DARTDOC_GRIND_STEP'] ?? 'test';
-  await launcher.runStreamed(
-      sdkBin('pub'), ['run', 'grinder', defaultGrindParameter],
-      workingDirectory: sdkDartdoc);
+  // TODO(srawlins): Re-enable sdk-analyzer when dart_style is published using
+  // analyzer 3.0.0.
+  try {
+    await launcher.runStreamed(
+        sdkBin('pub'), ['run', 'grinder', defaultGrindParameter],
+        workingDirectory: sdkDartdoc);
+  } catch (e, st) {
+    print('Warning: SDK analyzer job threw "$e":\n$st');
+  }
 }
 
 Future<List<Map<Object, Object>>> _buildSdkDocs(

From 87d1a80d9348e6c162a78b90c63061359a05b630 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Tue, 14 Dec 2021 08:50:29 -0800
Subject: [PATCH 3/3] indentation

---
 .github/workflows/test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4fa5cc00ae..0667f0bf27 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -34,8 +34,8 @@ jobs:
             # results.
           - sdk: stable
             job: flutter
-            - sdk: stable
-              job: sdk-analyzer
+          - sdk: stable
+            job: sdk-analyzer
           - sdk: stable
             job: sdk-docs