fix(execution): exclude skipped target from lookup for skippable depe…

…ndencies
nuke-build · Oct 12, 2024 · 0464568 · 0464568
1 parent 1688d82
commit 0464568
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/source/Nuke.Build.Tests/BuildExecutorTest.cs b/source/Nuke.Build.Tests/BuildExecutorTest.cs
@@ -105,6 +105,19 @@ public void TestStaticCondition_DependencyBehavior_Skip()
         B.OnlyWhen.Should().Be("false");
     }
 
+    [Fact]
+    public void TestStaticCondition_DependencyBehavior_Skip_Invoked()
+    {
+        C.Invoked = true;
+        C.StaticConditions.Add(("() => false", () => false));
+        B.DependencyBehavior = DependencyBehavior.Skip;
+        ExecuteBuild();
+        AssertSkipped(A, B, C);
+        A.Skipped.Should().Be("because of B");
+        B.Skipped.Should().Be("because of C");
+        C.OnlyWhen.Should().Be("false");
+    }
+
     [Fact]
     public void TestStaticCondition_Multiple()
     {

diff --git a/source/Nuke.Build/Execution/BuildExecutor.cs b/source/Nuke.Build/Execution/BuildExecutor.cs
@@ -195,12 +195,12 @@ private static void MarkTargetSkipped(INukeBuild build, ExecutableTarget target,
 
         bool HasOtherDependencies(ExecutableTarget dependentTarget)
             => build.ExecutionPlan
-                .Where(x => x.Status == ExecutionStatus.Scheduled)
+                .Where(x => x != target && x.Status == ExecutionStatus.Scheduled)
                 .Any(x => x.ExecutionDependencies.Contains(dependentTarget) || x.Triggers.Contains(dependentTarget));
 
-        var skippableTargets = target.ExecutionDependencies.Concat(target.Triggers)
+        var skippableDependencies = target.ExecutionDependencies.Concat(target.Triggers)
             .Where(x => !HasOtherDependencies(x)).ToList();
-        skippableTargets.ForEach(x => MarkTargetSkipped(build, x, $"because of {target.Name}"));
+        skippableDependencies.ForEach(x => MarkTargetSkipped(build, x, $"because of {target.Name}"));
     }
 
     private static void AppendToBuildAttemptFile(string value)