diff --git a/nextgen/action-graph/tests/action_graph_test.rs b/nextgen/action-graph/tests/action_graph_test.rs index ac0fd272e65..987bc415fd0 100644 --- a/nextgen/action-graph/tests/action_graph_test.rs +++ b/nextgen/action-graph/tests/action_graph_test.rs @@ -255,11 +255,11 @@ mod action_graph { topo(graph), vec![ ActionNode::SyncWorkspace, - ActionNode::SyncProject { - project: Id::raw("bar"), + ActionNode::SetupTool { runtime: create_node_runtime() }, - ActionNode::SetupTool { + ActionNode::SyncProject { + project: Id::raw("bar"), runtime: create_node_runtime() }, ActionNode::InstallDeps { @@ -296,11 +296,11 @@ mod action_graph { topo(graph), vec![ ActionNode::SyncWorkspace, - ActionNode::SyncProject { - project: Id::raw("bar"), + ActionNode::SetupTool { runtime: create_node_runtime() }, - ActionNode::SetupTool { + ActionNode::SyncProject { + project: Id::raw("bar"), runtime: create_node_runtime() }, ActionNode::InstallDeps { @@ -381,13 +381,16 @@ mod action_graph { topo(graph), vec![ ActionNode::SyncWorkspace, - ActionNode::SyncProject { - project: Id::raw("bar"), + ActionNode::SetupTool { runtime: create_node_runtime() }, ActionNode::SetupTool { runtime: create_rust_runtime() }, + ActionNode::SyncProject { + project: Id::raw("bar"), + runtime: create_node_runtime() + }, ActionNode::InstallDeps { runtime: create_rust_runtime() }, @@ -555,6 +558,9 @@ mod action_graph { topo(graph), vec![ ActionNode::SyncWorkspace, + ActionNode::SetupTool { + runtime: Runtime::system() + }, ActionNode::SyncProject { project: Id::raw("bar"), runtime: Runtime::system() @@ -578,6 +584,9 @@ mod action_graph { topo(graph), vec![ ActionNode::SyncWorkspace, + ActionNode::SetupTool { + runtime: Runtime::system() + }, ActionNode::SyncProject { project: Id::raw("bar"), runtime: Runtime::system() @@ -611,6 +620,9 @@ mod action_graph { topo(graph), vec![ ActionNode::SyncWorkspace, + ActionNode::SetupTool { + runtime: Runtime::system() + }, ActionNode::SyncProject { project: Id::raw("qux"), runtime: Runtime::system() @@ -644,6 +656,9 @@ mod action_graph { topo(graph), vec![ ActionNode::SyncWorkspace, + ActionNode::SetupTool { + runtime: Runtime::system() + }, ActionNode::SyncProject { project: Id::raw("bar"), runtime: Runtime::system() @@ -675,6 +690,12 @@ mod action_graph { topo(graph), vec![ ActionNode::SyncWorkspace, + ActionNode::SetupTool { + runtime: create_rust_runtime() + }, + ActionNode::SetupTool { + runtime: create_node_runtime() + }, ActionNode::SyncProject { project: Id::raw("qux"), runtime: create_rust_runtime() @@ -706,6 +727,15 @@ mod action_graph { topo(graph), vec![ ActionNode::SyncWorkspace, + ActionNode::SetupTool { + runtime: Runtime::new_override( + PlatformType::Node, + RuntimeReq::with_version(Version::new(18, 0, 0)) + ) + }, + ActionNode::SetupTool { + runtime: create_node_runtime() + }, ActionNode::SyncProject { project: Id::raw("baz"), runtime: Runtime::new_override( diff --git a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__run_task__graphs.snap b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__run_task__graphs.snap index bbb08d9a762..cb49bf8219b 100644 --- a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__run_task__graphs.snap +++ b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__run_task__graphs.snap @@ -10,7 +10,7 @@ digraph { 4 [ label="RunTask(bar:build)" ] 1 -> 0 [ ] 2 -> 1 [ ] - 3 -> 0 [ ] + 3 -> 1 [ ] 4 -> 2 [ ] 4 -> 3 [ ] } diff --git a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__run_task__task_can_have_a_diff_platform_from_project.snap b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__run_task__task_can_have_a_diff_platform_from_project.snap index ed6cd4af7c9..38f0da434df 100644 --- a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__run_task__task_can_have_a_diff_platform_from_project.snap +++ b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__run_task__task_can_have_a_diff_platform_from_project.snap @@ -6,12 +6,14 @@ digraph { 0 [ label="SyncWorkspace" ] 1 [ label="SetupRustTool(1.70.0)" ] 2 [ label="InstallRustDeps(1.70.0)" ] - 3 [ label="SyncNodeProject(bar)" ] - 4 [ label="RunTask(bar:build)" ] + 3 [ label="SetupNodeTool(20.0.0)" ] + 4 [ label="SyncNodeProject(bar)" ] + 5 [ label="RunTask(bar:build)" ] 1 -> 0 [ ] 2 -> 1 [ ] 3 -> 0 [ ] - 4 -> 2 [ ] 4 -> 3 [ ] + 5 -> 2 [ ] + 5 -> 4 [ ] } diff --git a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__graphs_multiple.snap b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__graphs_multiple.snap index bb151659335..6f9dda954a9 100644 --- a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__graphs_multiple.snap +++ b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__graphs_multiple.snap @@ -4,12 +4,14 @@ expression: graph.to_dot() --- digraph { 0 [ label="SyncWorkspace" ] - 1 [ label="SyncSystemProject(foo)" ] - 2 [ label="SyncSystemProject(bar)" ] - 3 [ label="SyncSystemProject(qux)" ] - 2 -> 0 [ ] + 1 [ label="SetupSystemTool" ] + 2 [ label="SyncSystemProject(foo)" ] + 3 [ label="SyncSystemProject(bar)" ] + 4 [ label="SyncSystemProject(qux)" ] 1 -> 0 [ ] - 1 -> 2 [ ] - 3 -> 0 [ ] + 3 -> 1 [ ] + 2 -> 1 [ ] + 2 -> 3 [ ] + 4 -> 1 [ ] } diff --git a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__graphs_single.snap b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__graphs_single.snap index 2afc70a17f2..ddfdb147fe1 100644 --- a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__graphs_single.snap +++ b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__graphs_single.snap @@ -4,7 +4,9 @@ expression: graph.to_dot() --- digraph { 0 [ label="SyncWorkspace" ] - 1 [ label="SyncSystemProject(bar)" ] + 1 [ label="SetupSystemTool" ] + 2 [ label="SyncSystemProject(bar)" ] 1 -> 0 [ ] + 2 -> 1 [ ] } diff --git a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__graphs_single_with_dep.snap b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__graphs_single_with_dep.snap index 4600b32bf02..46d410389a3 100644 --- a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__graphs_single_with_dep.snap +++ b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__graphs_single_with_dep.snap @@ -4,10 +4,12 @@ expression: graph.to_dot() --- digraph { 0 [ label="SyncWorkspace" ] - 1 [ label="SyncSystemProject(foo)" ] - 2 [ label="SyncSystemProject(bar)" ] - 2 -> 0 [ ] + 1 [ label="SetupSystemTool" ] + 2 [ label="SyncSystemProject(foo)" ] + 3 [ label="SyncSystemProject(bar)" ] 1 -> 0 [ ] - 1 -> 2 [ ] + 3 -> 1 [ ] + 2 -> 1 [ ] + 2 -> 3 [ ] } diff --git a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__inherits_platform_tool.snap b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__inherits_platform_tool.snap index f01b2d0d799..8a93b55531b 100644 --- a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__inherits_platform_tool.snap +++ b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__inherits_platform_tool.snap @@ -4,9 +4,13 @@ expression: graph.to_dot() --- digraph { 0 [ label="SyncWorkspace" ] - 1 [ label="SyncNodeProject(bar)" ] - 2 [ label="SyncRustProject(qux)" ] + 1 [ label="SetupNodeTool(20.0.0)" ] + 2 [ label="SyncNodeProject(bar)" ] + 3 [ label="SetupRustTool(1.70.0)" ] + 4 [ label="SyncRustProject(qux)" ] 1 -> 0 [ ] - 2 -> 0 [ ] + 2 -> 1 [ ] + 3 -> 0 [ ] + 4 -> 3 [ ] } diff --git a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__supports_platform_override.snap b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__supports_platform_override.snap index 197a66ca35b..8f0bbd2e090 100644 --- a/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__supports_platform_override.snap +++ b/nextgen/action-graph/tests/snapshots/action_graph_test__action_graph__sync_project__supports_platform_override.snap @@ -4,9 +4,13 @@ expression: graph.to_dot() --- digraph { 0 [ label="SyncWorkspace" ] - 1 [ label="SyncNodeProject(bar)" ] - 2 [ label="SyncNodeProject(baz)" ] + 1 [ label="SetupNodeTool(20.0.0)" ] + 2 [ label="SyncNodeProject(bar)" ] + 3 [ label="SetupNodeTool(18.0.0)" ] + 4 [ label="SyncNodeProject(baz)" ] 1 -> 0 [ ] - 2 -> 0 [ ] + 2 -> 1 [ ] + 3 -> 0 [ ] + 4 -> 3 [ ] }