From 661e79b84b1edde12619c87fbeadb4c59c2539da Mon Sep 17 00:00:00 2001 From: Pierre Chalamet Date: Mon, 29 Dec 2025 22:44:03 +0100 Subject: [PATCH] update self build --- WORKSPACE | 13 +++++++++---- src/Terrabuild.Common.Tests/PROJECT | 10 ++++++---- src/Terrabuild.Common/PROJECT | 7 +++++-- src/Terrabuild.Configuration.Tests/PROJECT | 10 ++++++---- src/Terrabuild.Configuration/PROJECT | 7 +++++-- src/Terrabuild.Expressions.Tests/PROJECT | 10 ++++++---- src/Terrabuild.Expressions/PROJECT | 7 +++++-- src/Terrabuild.Extensibility/PROJECT | 7 +++++-- src/Terrabuild.Extensions.Tests/PROJECT | 10 ++++++---- src/Terrabuild.Extensions/PROJECT | 7 +++++-- src/Terrabuild.Lang.Tests/PROJECT | 10 ++++++---- src/Terrabuild.Lang/PROJECT | 7 +++++-- src/Terrabuild.PubSub.Tests/PROJECT | 10 ++++++---- src/Terrabuild.PubSub/PROJECT | 7 +++++-- src/Terrabuild.Scripting.Tests/PROJECT | 10 ++++++---- src/Terrabuild.Scripting/PROJECT | 7 +++++-- src/Terrabuild.Tests/PROJECT | 10 ++++++---- src/Terrabuild/PROJECT | 12 ++++++++---- tools/DocGen/PROJECT | 7 +++++-- 19 files changed, 110 insertions(+), 58 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 3616029b..ef734339 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -23,23 +23,28 @@ locals { } } +target install { + outputs = [] + artifacts = ~workspace + build = ~lazy +} + target build { + artifacts = ~managed depends_on = [ target.install target.^build ] } target test { + artifacts = ~managed depends_on = [ target.build ] } target dist { + artifacts = ~external depends_on = [ target.build ] } -target publish { - depends_on = [ target.dist ] -} - extension @dotnet { image = local.is_local_build ? nothing : "mcr.microsoft.com/dotnet/sdk:${local.versions.dotnet_sdk}" defaults { diff --git a/src/Terrabuild.Common.Tests/PROJECT b/src/Terrabuild.Common.Tests/PROJECT index 0fcd5ebc..ba070324 100644 --- a/src/Terrabuild.Common.Tests/PROJECT +++ b/src/Terrabuild.Common.Tests/PROJECT @@ -3,12 +3,14 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } target test { - @dotnet restore { dependencies = true } - @dotnet test { dependencies = true } + @dotnet test { filter = "TestCategory!=integration" } } diff --git a/src/Terrabuild.Common/PROJECT b/src/Terrabuild.Common/PROJECT index a948e84a..3a40731a 100644 --- a/src/Terrabuild.Common/PROJECT +++ b/src/Terrabuild.Common/PROJECT @@ -3,7 +3,10 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } diff --git a/src/Terrabuild.Configuration.Tests/PROJECT b/src/Terrabuild.Configuration.Tests/PROJECT index 0fcd5ebc..ba070324 100644 --- a/src/Terrabuild.Configuration.Tests/PROJECT +++ b/src/Terrabuild.Configuration.Tests/PROJECT @@ -3,12 +3,14 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } target test { - @dotnet restore { dependencies = true } - @dotnet test { dependencies = true } + @dotnet test { filter = "TestCategory!=integration" } } diff --git a/src/Terrabuild.Configuration/PROJECT b/src/Terrabuild.Configuration/PROJECT index a948e84a..3a40731a 100644 --- a/src/Terrabuild.Configuration/PROJECT +++ b/src/Terrabuild.Configuration/PROJECT @@ -3,7 +3,10 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } diff --git a/src/Terrabuild.Expressions.Tests/PROJECT b/src/Terrabuild.Expressions.Tests/PROJECT index 0fcd5ebc..ba070324 100644 --- a/src/Terrabuild.Expressions.Tests/PROJECT +++ b/src/Terrabuild.Expressions.Tests/PROJECT @@ -3,12 +3,14 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } target test { - @dotnet restore { dependencies = true } - @dotnet test { dependencies = true } + @dotnet test { filter = "TestCategory!=integration" } } diff --git a/src/Terrabuild.Expressions/PROJECT b/src/Terrabuild.Expressions/PROJECT index a948e84a..3a40731a 100644 --- a/src/Terrabuild.Expressions/PROJECT +++ b/src/Terrabuild.Expressions/PROJECT @@ -3,7 +3,10 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } diff --git a/src/Terrabuild.Extensibility/PROJECT b/src/Terrabuild.Extensibility/PROJECT index a948e84a..3a40731a 100644 --- a/src/Terrabuild.Extensibility/PROJECT +++ b/src/Terrabuild.Extensibility/PROJECT @@ -3,7 +3,10 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } diff --git a/src/Terrabuild.Extensions.Tests/PROJECT b/src/Terrabuild.Extensions.Tests/PROJECT index 0fcd5ebc..ba070324 100644 --- a/src/Terrabuild.Extensions.Tests/PROJECT +++ b/src/Terrabuild.Extensions.Tests/PROJECT @@ -3,12 +3,14 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } target test { - @dotnet restore { dependencies = true } - @dotnet test { dependencies = true } + @dotnet test { filter = "TestCategory!=integration" } } diff --git a/src/Terrabuild.Extensions/PROJECT b/src/Terrabuild.Extensions/PROJECT index a948e84a..3a40731a 100644 --- a/src/Terrabuild.Extensions/PROJECT +++ b/src/Terrabuild.Extensions/PROJECT @@ -3,7 +3,10 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } diff --git a/src/Terrabuild.Lang.Tests/PROJECT b/src/Terrabuild.Lang.Tests/PROJECT index 0fcd5ebc..ba070324 100644 --- a/src/Terrabuild.Lang.Tests/PROJECT +++ b/src/Terrabuild.Lang.Tests/PROJECT @@ -3,12 +3,14 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } target test { - @dotnet restore { dependencies = true } - @dotnet test { dependencies = true } + @dotnet test { filter = "TestCategory!=integration" } } diff --git a/src/Terrabuild.Lang/PROJECT b/src/Terrabuild.Lang/PROJECT index a948e84a..3a40731a 100644 --- a/src/Terrabuild.Lang/PROJECT +++ b/src/Terrabuild.Lang/PROJECT @@ -3,7 +3,10 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } diff --git a/src/Terrabuild.PubSub.Tests/PROJECT b/src/Terrabuild.PubSub.Tests/PROJECT index 0fcd5ebc..ba070324 100644 --- a/src/Terrabuild.PubSub.Tests/PROJECT +++ b/src/Terrabuild.PubSub.Tests/PROJECT @@ -3,12 +3,14 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } target test { - @dotnet restore { dependencies = true } - @dotnet test { dependencies = true } + @dotnet test { filter = "TestCategory!=integration" } } diff --git a/src/Terrabuild.PubSub/PROJECT b/src/Terrabuild.PubSub/PROJECT index a948e84a..3a40731a 100644 --- a/src/Terrabuild.PubSub/PROJECT +++ b/src/Terrabuild.PubSub/PROJECT @@ -3,7 +3,10 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } diff --git a/src/Terrabuild.Scripting.Tests/PROJECT b/src/Terrabuild.Scripting.Tests/PROJECT index 0fcd5ebc..ba070324 100644 --- a/src/Terrabuild.Scripting.Tests/PROJECT +++ b/src/Terrabuild.Scripting.Tests/PROJECT @@ -3,12 +3,14 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } target test { - @dotnet restore { dependencies = true } - @dotnet test { dependencies = true } + @dotnet test { filter = "TestCategory!=integration" } } diff --git a/src/Terrabuild.Scripting/PROJECT b/src/Terrabuild.Scripting/PROJECT index a948e84a..3a40731a 100644 --- a/src/Terrabuild.Scripting/PROJECT +++ b/src/Terrabuild.Scripting/PROJECT @@ -3,7 +3,10 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } diff --git a/src/Terrabuild.Tests/PROJECT b/src/Terrabuild.Tests/PROJECT index 0fcd5ebc..ba070324 100644 --- a/src/Terrabuild.Tests/PROJECT +++ b/src/Terrabuild.Tests/PROJECT @@ -3,12 +3,14 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } } target test { - @dotnet restore { dependencies = true } - @dotnet test { dependencies = true } + @dotnet test { filter = "TestCategory!=integration" } } diff --git a/src/Terrabuild/PROJECT b/src/Terrabuild/PROJECT index bc980014..08aaf4f8 100644 --- a/src/Terrabuild/PROJECT +++ b/src/Terrabuild/PROJECT @@ -6,14 +6,18 @@ project terrabuild { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { version = terrabuild.tag } + @dotnet build { } } target dist { outputs = [] - @dotnet restore { dependencies = true } - @dotnet pack { } + @dotnet publish { single = true + build = true + restore = true } } diff --git a/tools/DocGen/PROJECT b/tools/DocGen/PROJECT index a948e84a..3a40731a 100644 --- a/tools/DocGen/PROJECT +++ b/tools/DocGen/PROJECT @@ -3,7 +3,10 @@ project { @dotnet { } } +target install { + @dotnet restore { } +} + target build { - @dotnet restore { dependencies = true } - @dotnet build { dependencies = true } + @dotnet build { } }