From a7984d93017f178cbd199ee73ec47a3629418f6b Mon Sep 17 00:00:00 2001 From: Chris Mitchell Date: Mon, 26 Jul 2021 10:06:26 -0700 Subject: [PATCH] Ensure pathsAffectingAllBuilds will include any changed files --- .../affectedmoduledetector/AffectedModuleDetector.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt b/affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt index e1588859..9f6e4e04 100644 --- a/affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt +++ b/affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt @@ -358,6 +358,8 @@ class AffectedModuleDetectorImpl constructor( findDependentProjects() } + private var changedFiles: MutableSet = mutableSetOf() + private var unknownFiles: MutableSet = mutableSetOf() override fun shouldInclude(project: Project): Boolean { @@ -400,8 +402,10 @@ class AffectedModuleDetectorImpl constructor( * Also populates the unknownFiles var which is used in findAffectedProjects */ private fun findChangedProjects(): Set { - val changedFiles = git.findChangedFiles( - includeUncommitted = true + changedFiles.addAll( + git.findChangedFiles( + includeUncommitted = true + ) ) val changedProjects = mutableSetOf() @@ -462,7 +466,7 @@ class AffectedModuleDetectorImpl constructor( if (changedProjects.isEmpty() && unknownFiles.isEmpty()) { buildAll = true } - unknownFiles.forEach { + changedFiles.forEach { if (affectsAllModules(it)) { buildAll = true }