fix: Fix more CI affected dependent issues. (#1625)

* Update builder.

* Add tests.

* Bump version.

.yarn/versions/4722c693.yml

@@ -0,0 +1,9 @@
+releases:
+  "@moonrepo/cli": patch
+  "@moonrepo/core-linux-arm64-gnu": patch
+  "@moonrepo/core-linux-arm64-musl": patch
+  "@moonrepo/core-linux-x64-gnu": patch
+  "@moonrepo/core-linux-x64-musl": patch
+  "@moonrepo/core-macos-arm64": patch
+  "@moonrepo/core-macos-x64": patch
+  "@moonrepo/core-windows-x64-msvc": patch

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+#### 🐞 Fixes
+
+- Fixed an issue around running dependents when a dependency is affected in CI.
+
 ## 1.27.9
 
 #### 🐞 Fixes

crates/action-graph/src/action_graph_builder.rs

@@ -225,9 +225,19 @@ impl<'app> ActionGraphBuilder<'app> {
                 color::property("runInCI"),
             );
 
-            // Dependents may still want to run though!
+            // Dependents may still want to run though,
+            // but only if this task was affected
             if reqs.dependents {
-                self.run_task_dependents(task, reqs, true)?;
+                if let Some(touched) = &reqs.touched_files {
+                    debug!(
+                        task = task.target.as_str(),
+                        "But will run all dependent tasks if affected"
+                    );
+
+                    if task.is_affected(touched)? {
+                        self.run_task_dependents(task, reqs)?;
+                    }
+                }
             }
 
             return Ok(None);
@@ -300,7 +310,7 @@ impl<'app> ActionGraphBuilder<'app> {
 
         // And possibly dependents
         if reqs.dependents {
-            self.run_task_dependents(task, reqs, false)?;
+            self.run_task_dependents(task, reqs)?;
         }
 
         Ok(Some(index))
@@ -348,7 +358,6 @@ impl<'app> ActionGraphBuilder<'app> {
         &mut self,
         task: &Task,
         parent_reqs: &RunRequirements<'app>,
-        with_touched: bool,
     ) -> miette::Result<Vec<NodeIndex>> {
         let mut indices = vec![];
 
@@ -357,11 +366,6 @@ impl<'app> ActionGraphBuilder<'app> {
         let reqs = RunRequirements {
             ci: parent_reqs.ci,
             interactive: parent_reqs.interactive,
-            touched_files: if with_touched {
-                parent_reqs.touched_files
-            } else {
-                None
-            },
             ..Default::default()
         };
 

crates/action-graph/tests/__fixtures__/tasks/ci/moon.yml

@@ -1,5 +1,7 @@
 tasks:
   ci1-dependency:
+    inputs:
+      - 'input.txt'
     options:
       runInCI: false
   ci1-dependant:
@@ -9,6 +11,8 @@ tasks:
       runInCI: true
 
   ci2-dependency:
+    inputs:
+      - 'input.txt'
     options:
       runInCI: false
   ci2-dependant:
@@ -18,6 +22,8 @@ tasks:
       runInCI: false
 
   ci3-dependency:
+    inputs:
+      - 'input.txt'
     options:
       runInCI: true
   ci3-dependant:
@@ -27,6 +33,8 @@ tasks:
       runInCI: false
 
   ci4-dependency:
+    inputs:
+      - 'input.txt'
     options:
       runInCI: true
   ci4-dependant:

crates/action-graph/tests/action_graph_test.rs

@@ -1129,7 +1129,39 @@ mod action_graph {
             }
 
             #[tokio::test]
-            async fn runs_dependents_if_dependency_is_ci_false() {
+            async fn runs_dependents_if_dependency_is_ci_false_but_affected() {
+                let sandbox = create_sandbox("tasks");
+                let container = ActionGraphContainer::new(sandbox.path()).await;
+                let mut builder = container.create_builder();
+
+                let project = container.project_graph.get("ci").unwrap();
+                let task = project.get_task("ci1-dependency").unwrap();
+
+                // Must be affected to run the dependent
+                let touched_files =
+                    FxHashSet::from_iter([WorkspaceRelativePathBuf::from("ci/input.txt")]);
+
+                builder
+                    .run_task(
+                        &project,
+                        task,
+                        &RunRequirements {
+                            ci: true,
+                            ci_check: true,
+                            dependents: true,
+                            touched_files: Some(&touched_files),
+                            ..RunRequirements::default()
+                        },
+                    )
+                    .unwrap();
+
+                let graph = builder.build();
+
+                assert_snapshot!(graph.to_dot());
+            }
+
+            #[tokio::test]
+            async fn doesnt_run_dependents_if_dependency_is_ci_false_and_not_affected() {
                 let sandbox = create_sandbox("tasks");
                 let container = ActionGraphContainer::new(sandbox.path()).await;
                 let mut builder = container.create_builder();
@@ -1145,6 +1177,7 @@ mod action_graph {
                             ci: true,
                             ci_check: true,
                             dependents: true,
+                            touched_files: None,
                             ..RunRequirements::default()
                         },
                     )

crates/action-graph/tests/snapshots/action_graph_test__action_graph__run_task__dont_run_in_ci__doesnt_run_dependents_if_dependency_is_ci_false_and_not_affected.snap

@@ -0,0 +1,6 @@
+---
+source: crates/action-graph/tests/action_graph_test.rs
+expression: graph.to_dot()
+---
+digraph {
+}