From dd99487de3b0a2f7d440ad7018429cf806173f77 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 16 May 2025 13:55:44 -0400 Subject: [PATCH 1/2] Ignore .cxx/ directories Android builds now create .cxx directories in some cases; this has been added to the app template's ignore file, so should be ignored here as well. As is generally the case for this repo, we ignore it at the root level instead of updating every package. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0af22121e6a5..c9dae8e685c2 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,7 @@ GeneratedPluginRegistrant.* .gradle/ gradlew gradlew.bat +.cxx/ .project .classpath From 7dcc7ba5128fdf9366933fcb3da115cf24f82071 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 21 May 2025 10:54:05 -0400 Subject: [PATCH 2/2] Skip integration tests for .gitignore changes --- script/tool/lib/src/drive_examples_command.dart | 8 +++++++- script/tool/test/drive_examples_command_test.dart | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/script/tool/lib/src/drive_examples_command.dart b/script/tool/lib/src/drive_examples_command.dart index 84689bcb5aaa..3033d389faf5 100644 --- a/script/tool/lib/src/drive_examples_command.dart +++ b/script/tool/lib/src/drive_examples_command.dart @@ -71,7 +71,13 @@ class DriveExamplesCommand extends PackageLoopingCommand { @override bool shouldIgnoreFile(String path) { - return isRepoLevelNonCodeImpactingFile(path) || isPackageSupportFile(path); + return isRepoLevelNonCodeImpactingFile(path) || + isPackageSupportFile(path) || + // This isn't part of isRepoLevelNonCodeImpactingFile since there could + // potentially be code-based commands that it could affect, but it + // should not affect integration tests, and they are the most expensive + // and flaky tests. + path == '.gitignore'; } @override diff --git a/script/tool/test/drive_examples_command_test.dart b/script/tool/test/drive_examples_command_test.dart index b556124f585f..97c7e838d196 100644 --- a/script/tool/test/drive_examples_command_test.dart +++ b/script/tool/test/drive_examples_command_test.dart @@ -1763,6 +1763,7 @@ packages/package_a/$file FakeProcessInfo(MockProcess(stdout: ''' README.md CODEOWNERS +.gitignore packages/package_a/CHANGELOG.md ''')), ];