From 2931dfa91a5705d04eb70cd7514ef80e94586401 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 4 Jan 2024 12:57:52 -0800 Subject: [PATCH 1/6] Roll buildroot to pick up iOS 12 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 04f08629d7d07..04730193f7972 100644 --- a/DEPS +++ b/DEPS @@ -267,7 +267,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '0141e94b34cbd3db77f28796587334857fa985da', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '5dad8aca3a827dcc01adef09da81b1a99de86989', 'src/flutter/third_party/rapidjson': Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b', From 6febc9ffc528c57a01eb581e1b2b1e3d8b98fdda Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 5 Jan 2024 13:36:06 -0800 Subject: [PATCH 2/6] sed --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 04730193f7972..0a765acd5c7d5 100644 --- a/DEPS +++ b/DEPS @@ -267,7 +267,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '5dad8aca3a827dcc01adef09da81b1a99de86989', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '0cb1087296d0acde9e727c1747961ac958ddab16', 'src/flutter/third_party/rapidjson': Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b', From 9ca0588f80df894cc4bcc8a700efdf97abed929a Mon Sep 17 00:00:00 2001 From: Zachary Anderson Date: Mon, 8 Jan 2024 09:43:22 -0800 Subject: [PATCH 3/6] Roll buildroot further --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 0a765acd5c7d5..b7fa8c2869c2d 100644 --- a/DEPS +++ b/DEPS @@ -267,7 +267,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '0cb1087296d0acde9e727c1747961ac958ddab16', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '8c274b21f1ad4f2aec0a5e0ae8f4264393045b4b', 'src/flutter/third_party/rapidjson': Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b', From 1ceb2b48cebe3f93d6aa8a2570219d17d4ea253a Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Mon, 8 Jan 2024 10:53:56 -0800 Subject: [PATCH 4/6] debug clang-tidy output --- tools/clang_tidy/lib/clang_tidy.dart | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/clang_tidy/lib/clang_tidy.dart b/tools/clang_tidy/lib/clang_tidy.dart index e3757b9f40d83..e4d8f8f55268c 100644 --- a/tools/clang_tidy/lib/clang_tidy.dart +++ b/tools/clang_tidy/lib/clang_tidy.dart @@ -430,9 +430,11 @@ class ClangTidy { final Exception? exception = job.exception; if (exception != null) { _errSink.writeln(trimOutput(exception.toString())); - } else { - _errSink.writeln(trimOutput(job.result.stdout)); } + + _errSink.writeln(trimOutput(job.result.stdout)); + _errSink.writeln(trimOutput(job.result.stderr)); + } result = 1; } From 38ccb5249f0f8c4522b2eb3d13761fbad6126a83 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Mon, 8 Jan 2024 11:39:38 -0800 Subject: [PATCH 5/6] failOk false --- tools/clang_tidy/lib/src/command.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/clang_tidy/lib/src/command.dart b/tools/clang_tidy/lib/src/command.dart index 980841038c1eb..7225d22f901c3 100644 --- a/tools/clang_tidy/lib/src/command.dart +++ b/tools/clang_tidy/lib/src/command.dart @@ -155,7 +155,8 @@ class Command { [clangTidyPath, ...args], workingDirectory: directory, name: 'clang-tidy on $filePath', - printOutput: options.verbose, + printOutput: true, + failOk: false, ); } } From bd0f5a1bdb06c9e5a18bc9cf2c30b05df5012164 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Mon, 8 Jan 2024 15:40:52 -0800 Subject: [PATCH 6/6] Reset clang tidy debugging --- tools/clang_tidy/lib/clang_tidy.dart | 6 ++---- tools/clang_tidy/lib/src/command.dart | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/clang_tidy/lib/clang_tidy.dart b/tools/clang_tidy/lib/clang_tidy.dart index e4d8f8f55268c..e3757b9f40d83 100644 --- a/tools/clang_tidy/lib/clang_tidy.dart +++ b/tools/clang_tidy/lib/clang_tidy.dart @@ -430,11 +430,9 @@ class ClangTidy { final Exception? exception = job.exception; if (exception != null) { _errSink.writeln(trimOutput(exception.toString())); + } else { + _errSink.writeln(trimOutput(job.result.stdout)); } - - _errSink.writeln(trimOutput(job.result.stdout)); - _errSink.writeln(trimOutput(job.result.stderr)); - } result = 1; } diff --git a/tools/clang_tidy/lib/src/command.dart b/tools/clang_tidy/lib/src/command.dart index 7225d22f901c3..980841038c1eb 100644 --- a/tools/clang_tidy/lib/src/command.dart +++ b/tools/clang_tidy/lib/src/command.dart @@ -155,8 +155,7 @@ class Command { [clangTidyPath, ...args], workingDirectory: directory, name: 'clang-tidy on $filePath', - printOutput: true, - failOk: false, + printOutput: options.verbose, ); } }