From 8c370f94750b7a09745e1145f6d0946414365852 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 2 Mar 2023 16:16:03 -0500 Subject: [PATCH 1/2] [pigeon] Only check generated files on master Skip output file checks on stable, since `dart format` can change between channels. This helps unblock the roll. --- packages/pigeon/tool/run_tests.dart | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/pigeon/tool/run_tests.dart b/packages/pigeon/tool/run_tests.dart index f7bc3530005..716dcd90c05 100644 --- a/packages/pigeon/tool/run_tests.dart +++ b/packages/pigeon/tool/run_tests.dart @@ -164,7 +164,14 @@ Future main(List args) async { // configurations have different setups (e.g., different clang-format versions // or no clang-format at all). if (Platform.isLinux) { - await _validateGeneratedTestFiles(); + // Only run on master, since Dart format can change between versions. + // TODO(stuartmorgan): Make a more generic way to run this check only on + // master; this currently won't work for anything but Cirrus. + if (Platform.environment['CHANNEL'] != 'stable') { + print('Skipping generated file validation on stable.'); + } else { + await _validateGeneratedTestFiles(); + } } final List testsToRun; From c37d5068232401e16a4e0a4268b0cc595de7ad17 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 2 Mar 2023 16:29:20 -0500 Subject: [PATCH 2/2] Fix reversed check --- packages/pigeon/tool/run_tests.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/tool/run_tests.dart b/packages/pigeon/tool/run_tests.dart index 716dcd90c05..f00eb860b86 100644 --- a/packages/pigeon/tool/run_tests.dart +++ b/packages/pigeon/tool/run_tests.dart @@ -167,7 +167,7 @@ Future main(List args) async { // Only run on master, since Dart format can change between versions. // TODO(stuartmorgan): Make a more generic way to run this check only on // master; this currently won't work for anything but Cirrus. - if (Platform.environment['CHANNEL'] != 'stable') { + if (Platform.environment['CHANNEL'] == 'stable') { print('Skipping generated file validation on stable.'); } else { await _validateGeneratedTestFiles();