Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure Task can depend across workspaces #3820

Merged
merged 3 commits into from
Feb 15, 2023
Merged

Ensure Task can depend across workspaces #3820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
388fdd4
Add test to prove that cross-workspace dependsOn works with Workspace…
mehulkar Feb 15, 2023
072561b
Update hashes for tasks in tests that rely on blank-pkg
mehulkar Feb 15, 2023
73a7028
Merge branch 'main' into mehulkar/turbo-799-ensure-workspace-config-t…
mehulkar Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions cli/integration_tests/composable_config/composing-cross-workspace.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Setup
$ . ${TESTDIR}/../setup.sh
$ . ${TESTDIR}/setup.sh $(pwd) ./monorepo
$ ${TURBO} run cross-workspace-task --filter=cross-workspace
\xe2\x80\xa2 Packages in scope: cross-workspace (esc)
\xe2\x80\xa2 Running cross-workspace-task in 1 packages (esc)
\xe2\x80\xa2 Remote caching disabled (esc)
blank-pkg:cross-workspace-underlying-task: cache miss, executing e1997d6444832f47
blank-pkg:cross-workspace-underlying-task:
blank-pkg:cross-workspace-underlying-task: > cross-workspace-underlying-task
blank-pkg:cross-workspace-underlying-task: > echo "cross-workspace-underlying-task from blank-pkg"
blank-pkg:cross-workspace-underlying-task:
blank-pkg:cross-workspace-underlying-task: cross-workspace-underlying-task from blank-pkg
cross-workspace:cross-workspace-task: cache miss, executing 6fd8bbb8fdb12e2e
cross-workspace:cross-workspace-task:
cross-workspace:cross-workspace-task: > cross-workspace-task
cross-workspace:cross-workspace-task: > echo "cross-workspace-task"
cross-workspace:cross-workspace-task:
cross-workspace:cross-workspace-task: cross-workspace-task

Tasks: 2 successful, 2 total
Cached: 0 cached, 2 total
Time:\s*[\.0-9]+m?s (re)

4 changes: 2 additions & 2 deletions cli/integration_tests/composable_config/composing-missing-workspace-config-deps.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Setup
\xe2\x80\xa2 Remote caching disabled (esc)

$ cat tmp.log | grep "missing-workspace-config:missing-workspace-config-task-with-deps"
missing-workspace-config:missing-workspace-config-task-with-deps: cache miss, executing 68582686ba468bdb
missing-workspace-config:missing-workspace-config-task-with-deps: cache miss, executing 35e5f5b0b58468a8
missing-workspace-config:missing-workspace-config-task-with-deps:
missing-workspace-config:missing-workspace-config-task-with-deps: > missing-workspace-config-task-with-deps
missing-workspace-config:missing-workspace-config-task-with-deps: > echo "running missing-workspace-config-task-with-deps" > out/foo.min.txt
Expand All @@ -31,7 +31,7 @@ Setup
missing-workspace-config:missing-workspace-config-underlying-task: running missing-workspace-config-underlying-task

$ cat tmp.log | grep "blank-pkg:missing-workspace-config-underlying-topo-task"
blank-pkg:missing-workspace-config-underlying-topo-task: cache miss, executing 7f25337c32f440a0
blank-pkg:missing-workspace-config-underlying-topo-task: cache miss, executing 7a03890dc4926724
blank-pkg:missing-workspace-config-underlying-topo-task:
blank-pkg:missing-workspace-config-underlying-topo-task: > missing-workspace-config-underlying-topo-task
blank-pkg:missing-workspace-config-underlying-topo-task: > echo "missing-workspace-config-underlying-topo-task from blank-pkg"
Expand Down
4 changes: 2 additions & 2 deletions cli/integration_tests/composable_config/composing-omit-keys-deps.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Setup
\xe2\x80\xa2 Running omit-keys-task-with-deps in 1 packages (esc)

$ cat tmp.log | grep "omit-keys:omit-keys-task-with-deps"
omit-keys:omit-keys-task-with-deps: cache miss, executing c12b0d1d341419fd
omit-keys:omit-keys-task-with-deps: cache miss, executing 5a57686e181e021a
omit-keys:omit-keys-task-with-deps:
omit-keys:omit-keys-task-with-deps: > omit-keys-task-with-deps
omit-keys:omit-keys-task-with-deps: > echo "running omit-keys-task-with-deps" > out/foo.min.txt
Expand All @@ -31,7 +31,7 @@ Setup
omit-keys:omit-keys-underlying-task: running omit-keys-underlying-task

$ cat tmp.log | grep "blank-pkg:omit-keys-underlying-topo-task"
blank-pkg:omit-keys-underlying-topo-task: cache miss, executing 5b3c524f8ead8679
blank-pkg:omit-keys-underlying-topo-task: cache miss, executing ea682b492b632165
blank-pkg:omit-keys-underlying-topo-task:
blank-pkg:omit-keys-underlying-topo-task: > omit-keys-underlying-topo-task
blank-pkg:omit-keys-underlying-topo-task: > echo "omit-keys-underlying-topo-task from blank-pkg"
Expand Down
4 changes: 2 additions & 2 deletions cli/integration_tests/composable_config/composing-override-values-deps.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Setup
\xe2\x80\xa2 Remote caching disabled (esc)

$ cat tmp.log | grep "override-values:override-values-task-with-deps"
override-values:override-values-task-with-deps: cache miss, executing cf35abb7b46ffad7
override-values:override-values-task-with-deps: cache miss, executing 28b15810eec6414c
override-values:override-values-task-with-deps:
override-values:override-values-task-with-deps: > override-values-task-with-deps
override-values:override-values-task-with-deps: > echo "running override-values-task-with-deps" > out/foo.min.txt
Expand All @@ -31,7 +31,7 @@ Setup
override-values:override-values-underlying-task: running override-values-underlying-task

$ cat tmp.log | grep "blank-pkg:override-values-underlying-topo-task"
blank-pkg:override-values-underlying-topo-task: cache miss, executing 0e2630802fda80c3
blank-pkg:override-values-underlying-topo-task: cache miss, executing f0958e21dc79dfbc
blank-pkg:override-values-underlying-topo-task:
blank-pkg:override-values-underlying-topo-task: > override-values-underlying-topo-task
blank-pkg:override-values-underlying-topo-task: > echo "override-values-underlying-topo-task from blank-pkg"
Expand Down
6 changes: 6 additions & 0 deletions cli/integration_tests/composable_config/monorepo/apps/cross-workspace/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "cross-workspace",
"scripts": {
"cross-workspace-task": "echo \"cross-workspace-task\""
}
}
8 changes: 8 additions & 0 deletions cli/integration_tests/composable_config/monorepo/apps/cross-workspace/turbo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": ["//"],
"pipeline": {
"cross-workspace-task": {
"dependsOn": ["blank-pkg#cross-workspace-underlying-task"]
}
}
}
3 changes: 2 additions & 1 deletion cli/integration_tests/composable_config/monorepo/packages/blank-pkg/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"scripts": {
"omit-keys-underlying-topo-task": "echo \"omit-keys-underlying-topo-task from blank-pkg\"",
"missing-workspace-config-underlying-topo-task": "echo \"missing-workspace-config-underlying-topo-task from blank-pkg\"",
"override-values-underlying-topo-task": "echo \"override-values-underlying-topo-task from blank-pkg\""
"override-values-underlying-topo-task": "echo \"override-values-underlying-topo-task from blank-pkg\"",
"cross-workspace-underlying-task": "echo \"cross-workspace-underlying-task from blank-pkg\""
}
}
6 changes: 6 additions & 0 deletions cli/integration_tests/composable_config/monorepo/packages/blank-pkg/turbo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": ["//"],
"pipeline": {
"cross-workspace-underlying-task": {}
}
}