fix: Audit 02/11 (#1826)

* Fix pg dupes.

* Fix.

* Add node state.

* Fix affected/touched files.

* Fix CI.

Author: milesj

.github/workflows/moon.yml

@@ -19,6 +19,10 @@ on:
       - Cargo.toml
       - rust-toolchain.toml
 
+env:
+  # For setup-rust
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 jobs:
   ci:
     name: CI

.github/workflows/release.yml

@@ -2,6 +2,8 @@ name: Release
 
 env:
   APP_NAME: moon
+  # For setup-rust
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 on:
   # Manually release cli/core packages

.github/workflows/rust.yml

@@ -1,4 +1,5 @@
 name: Rust
+
 on:
   push:
     branches:
@@ -18,6 +19,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  # For setup-rust
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 jobs:
   build-wasm:
     name: Build WASM

.moon/workspace.yml

@@ -1,4 +1,4 @@
-# Trigger CI: 25
+# Trigger CI: 26
 
 $schema: '../website/static/schemas/workspace.json'
 

.yarn/versions/4e37e450.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,12 @@
 # Changelog
 
+## Unreleased
+
+#### 🐞 Fixes
+
+- Fixed an issue where a project could be inserted into the project graph multiple times.
+- Fixed an issue where touched files would sometimes not be available outside of affected scopes.
+
 ## 1.32.3
 
 #### 🐞 Fixes

crates/action-graph/src/action_graph_builder.rs

@@ -44,7 +44,7 @@ pub struct ActionGraphBuilder<'app> {
 
     // Affected states
     affected: Option<AffectedTracker<'app>>,
-    touched_files: Option<&'app FxHashSet<WorkspaceRelativePathBuf>>,
+    touched_files: Option<FxHashSet<WorkspaceRelativePathBuf>>,
 
     // Target tracking
     initial_targets: FxHashSet<Target>,
@@ -124,6 +124,19 @@ impl<'app> ActionGraphBuilder<'app> {
         Runtime::system()
     }
 
+    pub fn set_affected(&mut self) {
+        let Some(touched_files) = &self.touched_files else {
+            return;
+        };
+
+        if self.affected.is_none() {
+            self.affected = Some(AffectedTracker::new(
+                self.workspace_graph,
+                touched_files.to_owned(),
+            ));
+        }
+    }
+
     pub fn set_affected_scopes(
         &mut self,
         upstream: UpstreamScope,
@@ -138,9 +151,10 @@ impl<'app> ActionGraphBuilder<'app> {
             self.workspace_graph.get_tasks_with_internal()?;
         }
 
+        self.set_affected();
         self.affected
             .as_mut()
-            .expect("Affected tracker not set!")
+            .unwrap()
             .with_scopes(upstream, downstream);
 
         Ok(())
@@ -154,10 +168,9 @@ impl<'app> ActionGraphBuilder<'app> {
 
     pub fn set_touched_files(
         &mut self,
-        touched_files: &'app FxHashSet<WorkspaceRelativePathBuf>,
+        touched_files: FxHashSet<WorkspaceRelativePathBuf>,
     ) -> miette::Result<()> {
         self.touched_files = Some(touched_files);
-        self.affected = Some(AffectedTracker::new(self.workspace_graph, touched_files));
 
         Ok(())
     }

crates/action-graph/tests/action_graph_test.rs

@@ -903,7 +903,8 @@ mod action_graph {
 
                 // Empty set works fine, just needs to be some
                 let touched_files = FxHashSet::default();
-                builder.set_touched_files(&touched_files).unwrap();
+                builder.set_touched_files(touched_files).unwrap();
+                builder.set_affected();
 
                 builder
                     .run_task(&project, &task, &RunRequirements::default())
@@ -934,7 +935,8 @@ mod action_graph {
                 task.input_files.insert(file.clone());
 
                 let touched_files = FxHashSet::from_iter([file]);
-                builder.set_touched_files(&touched_files).unwrap();
+                builder.set_touched_files(touched_files).unwrap();
+                builder.set_affected();
                 builder.mock_affected(|affected| {
                     affected
                         .mark_task_affected(&task, AffectedBy::AlwaysAffected)
@@ -967,7 +969,8 @@ mod action_graph {
 
                 let touched_files =
                     FxHashSet::from_iter([WorkspaceRelativePathBuf::from("deps-affected/b.txt")]);
-                builder.set_touched_files(&touched_files).unwrap();
+                builder.set_touched_files(touched_files).unwrap();
+                builder.set_affected();
                 builder.mock_affected(|affected| {
                     affected
                         .mark_task_affected(&task, AffectedBy::AlwaysAffected)

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

@@ -7,19 +7,19 @@ digraph {
     1 [ label="SetupToolchain(system)" ]
     2 [ label="SyncProject(system, deps)" ]
     3 [ label="RunTask(deps:base)" ]
-    4 [ label="SyncProject(system, deps-external)" ]
-    5 [ label="RunTask(deps-external:external)" ]
-    6 [ label="RunTask(deps:parent2)" ]
-    7 [ label="RunTask(deps:parent1)" ]
+    4 [ label="RunTask(deps:parent2)" ]
+    5 [ label="RunTask(deps:parent1)" ]
+    6 [ label="SyncProject(system, deps-external)" ]
+    7 [ label="RunTask(deps-external:external)" ]
     1 -> 0 [ ]
     2 -> 1 [ ]
     3 -> 2 [ ]
-    4 -> 1 [ ]
     4 -> 2 [ ]
-    5 -> 4 [ ]
+    4 -> 3 [ ]
+    5 -> 2 [ ]
     5 -> 3 [ ]
+    6 -> 1 [ ]
     6 -> 2 [ ]
-    6 -> 3 [ ]
-    7 -> 2 [ ]
+    7 -> 6 [ ]
     7 -> 3 [ ]
 }

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

@@ -7,19 +7,19 @@ digraph {
     1 [ label="SetupToolchain(system)" ]
     2 [ label="SyncProject(system, deps)" ]
     3 [ label="RunTask(deps:base)" ]
-    4 [ label="SyncProject(system, deps-external)" ]
-    5 [ label="RunTask(deps-external:external)" ]
-    6 [ label="RunTask(deps:parent2)" ]
-    7 [ label="RunTask(deps:parent1)" ]
+    4 [ label="RunTask(deps:parent2)" ]
+    5 [ label="RunTask(deps:parent1)" ]
+    6 [ label="SyncProject(system, deps-external)" ]
+    7 [ label="RunTask(deps-external:external)" ]
     1 -> 0 [ ]
     2 -> 1 [ ]
     3 -> 2 [ ]
-    4 -> 1 [ ]
     4 -> 2 [ ]
-    5 -> 4 [ ]
+    4 -> 3 [ ]
+    5 -> 2 [ ]
     5 -> 3 [ ]
+    6 -> 1 [ ]
     6 -> 2 [ ]
-    6 -> 3 [ ]
-    7 -> 2 [ ]
+    7 -> 6 [ ]
     7 -> 3 [ ]
 }