Skip to content

ignore sub workspace #70

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

Merged
pchalamet merged 1 commit into from
Jan 1, 2025
Merged

ignore sub workspace #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ docs:
dotnet run --project tools/DocGen -- src/Terrabuild.Extensions/bin/$(buildconfig)/net9.0/Terrabuild.Extensions.xml ../../websites/terrabuild.io/content/docs/extensions

self: clean publish
.out/dotnet/terrabuild run build test dist --workspace src --configuration $(env) --retry --debug --logs --local-only
.out/dotnet/terrabuild run build test dist --configuration $(env) --retry --debug --logs --local-only

terrabuild:
terrabuild run build test dist --workspace src --configuration $(env) --retry --debug --logs --local-only
terrabuild run build test dist --configuration $(env) --retry --debug --logs --local-only


#
Expand Down
0 src/WORKSPACE → WORKSPACE
View file
Open in desktop
File renamed without changes.
16 changes: 11 additions & 5 deletions src/Terrabuild/Core/Configuration.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,18 +435,24 @@ let read (options: ConfigOptions.Options) =


let projectFiles =
let rec findDependencies dir =
let rec findDependencies isRoot dir =
seq {
let projectFile = FS.combinePath dir "PROJECT"
let projectFile = FS.combinePath dir "PROJECT"
match projectFile with
| FS.File file ->
file |> FS.parentDirectory |> FS.relativePath options.Workspace
| _ ->
for subdir in dir |> IO.enumerateDirs do
yield! findDependencies subdir
// ignore sub WORKSPACE files if not root workspace
let workspaceFile = FS.combinePath dir "WORKSPACE"
match isRoot, workspaceFile with
| false, FS.File _ ->
()
| _ ->
for subdir in dir |> IO.enumerateDirs do
yield! findDependencies false subdir
}

findDependencies options.Workspace
findDependencies true options.Workspace

let projects = ConcurrentDictionary<string, Project>()
let hub = Hub.Create(options.MaxConcurrency)
Expand Down
Loading