Add Spectre.Console project as submodule

nuke-build · Jun 4, 2022 · bd1e40a · bd1e40a
1 parent 78aab2e
commit bd1e40a
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 5 deletions.
diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml
@@ -30,7 +30,10 @@ jobs:
     name: windows-latest
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          fetch-depth: 0
       - name: Cache .nuke/temp, ~/.nuget/packages
         uses: actions/cache@v2
         with:
@@ -54,7 +57,10 @@ jobs:
     name: ubuntu-latest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          fetch-depth: 0
       - name: Cache .nuke/temp, ~/.nuget/packages
         uses: actions/cache@v2
         with:
@@ -78,7 +84,10 @@ jobs:
     name: macOS-latest
     runs-on: macOS-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          fetch-depth: 0
       - name: Cache .nuke/temp, ~/.nuget/packages
         uses: actions/cache@v2
         with:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ image: mcr.microsoft.com/dotnet/sdk:5.0
 
 variables:
   GIT_DEPTH: 0
+  GIT_SUBMODULE_STRATEGY: recursive
 
 stages:
   - build

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "external/spectre.console"]
+	path = external/spectre.console
+	url = https://github.com/matkoch/spectre.console
diff --git a/.space.kts b/.space.kts
@@ -24,7 +24,10 @@ job("continuous") {
 
     container("mcr.microsoft.com/dotnet/sdk:6.0") {
         shellScript {
-            content = "./build.sh Test"
+            content = """
+                git submodule update --init --recursive
+                ./build.sh Test
+            """
         }
     }
 

diff --git a/appveyor.continuous.yml b/appveyor.continuous.yml
@@ -26,6 +26,9 @@ branches:
 
 skip_tags: true
 
+install:
+  - git submodule update --init --recursive
+
 build_script:
   - cmd: .\build.cmd Test Pack
   - sh: ./build.cmd Test Pack

diff --git a/appveyor.yml b/appveyor.yml
@@ -24,6 +24,9 @@ branches:
 
 skip_tags: true
 
+install:
+  - git submodule update --init --recursive
+
 build_script:
   - cmd: .\build.cmd Pack Test SignPackages Publish
   - sh: ./build.cmd Pack Test SignPackages Publish

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -30,6 +30,8 @@ stages:
         strategy:
           parallel: 2
         steps:
+          - checkout: self
+            submodules: true
           - task: Cache@2
             displayName: Cache (nuke-temp)
             inputs:
@@ -53,6 +55,8 @@ stages:
         displayName: '📦 Pack'
         dependsOn: [  ]
         steps:
+          - checkout: self
+            submodules: true
           - task: Cache@2
             displayName: Cache (nuke-temp)
             inputs:
@@ -84,6 +88,8 @@ stages:
         strategy:
           parallel: 2
         steps:
+          - checkout: self
+            submodules: true
           - task: Cache@2
             displayName: Cache (nuke-temp)
             inputs:
@@ -107,6 +113,8 @@ stages:
         displayName: '📦 Pack'
         dependsOn: [  ]
         steps:
+          - checkout: self
+            submodules: true
           - task: Cache@2
             displayName: Cache (nuke-temp)
             inputs:
@@ -138,6 +146,8 @@ stages:
         strategy:
           parallel: 2
         steps:
+          - checkout: self
+            submodules: true
           - task: Cache@2
             displayName: Cache (nuke-temp)
             inputs:
@@ -161,6 +171,8 @@ stages:
         displayName: '📦 Pack'
         dependsOn: [  ]
         steps:
+          - checkout: self
+            submodules: true
           - task: Cache@2
             displayName: Cache (nuke-temp)
             inputs:

diff --git a/build/Build.CI.AppVeyor.cs b/build/Build.CI.AppVeyor.cs
@@ -8,6 +8,7 @@
 [AppVeyor(
     suffix: null,
     AppVeyorImage.VisualStudio2022,
+    Submodules = true,
     BranchesOnly = new[] { MasterBranch, $"/{ReleaseBranchPrefix}\\/*/" },
     SkipTags = true,
     InvokedTargets = new[] { nameof(IPack.Pack), nameof(ITest.Test), nameof(ISignPackages.SignPackages), nameof(IPublish.Publish) },
@@ -28,6 +29,7 @@
     AppVeyorImage.VisualStudioLatest,
     AppVeyorImage.UbuntuLatest,
     AppVeyorImage.MacOsLatest,
+    Submodules = true,
     BranchesExcept = new[] { MasterBranch, $"/{ReleaseBranchPrefix}\\/*/" },
     SkipTags = true,
     InvokedTargets = new[] { nameof(ITest.Test), nameof(IPack.Pack) },

diff --git a/build/Build.CI.AzurePipelines.cs b/build/Build.CI.AzurePipelines.cs
@@ -17,6 +17,7 @@
     AzurePipelinesImage.WindowsLatest,
     AzurePipelinesImage.MacOsLatest,
     PullRequestsDisabled = true,
+    Submodules = true,
     InvokedTargets = new[] { nameof(ITest.Test), nameof(IPack.Pack) },
     NonEntryTargets = new[] { nameof(IRestore.Restore), nameof(DownloadLicenses), nameof(ICompile.Compile), nameof(InstallFonts), nameof(ReleaseImage) },
     ExcludedTargets = new[] { nameof(Clean), nameof(ISignPackages.SignPackages) },

diff --git a/build/Build.CI.GitHubActions.cs b/build/Build.CI.GitHubActions.cs
@@ -10,9 +10,11 @@
     GitHubActionsImage.WindowsLatest,
     GitHubActionsImage.UbuntuLatest,
     GitHubActionsImage.MacOsLatest,
+    Submodules = GitHubActionsSubmodules.Recursive,
+    FetchDepth = 0,
     OnPushBranchesIgnore = new[] { MasterBranch, $"{ReleaseBranchPrefix}/*" },
     OnPullRequestBranches = new[] { DevelopBranch },
-    PublishArtifacts = false,
+    PublishArtifacts = true,
     InvokedTargets = new[] { nameof(ITest.Test), nameof(IPack.Pack) },
     CacheKeyFiles = new[] { "global.json", "source/**/*.csproj" },
     EnableGitHubToken = true)]

diff --git a/build/Build.CI.SpaceAutomation.cs b/build/Build.CI.SpaceAutomation.cs
@@ -8,6 +8,7 @@
 [SpaceAutomation(
     name: "continuous",
     image: "mcr.microsoft.com/dotnet/sdk:6.0",
+    Submodules = true,
     OnPush = true,
     InvokedTargets = new[] { nameof(ITest.Test) })]
 partial class Build

diff --git a/build/Build.Licenses.cs b/build/Build.Licenses.cs
@@ -29,6 +29,7 @@ partial class Build
                ("NuGet", "https://raw.githubusercontent.com/NuGet/NuGet.Client/dev/LICENSE.txt"),
                ("Octokit", "https://raw.githubusercontent.com/octokit/octokit.net/main/LICENSE.txt"),
                ("Serilog", "https://raw.githubusercontent.com/serilog/serilog/dev/LICENSE"),
+               ("Spectre.Console", "https://raw.githubusercontent.com/matkoch/spectre.console/main/LICENSE.md"),
                ("YamlDotNet", "https://raw.githubusercontent.com/aaubry/YamlDotNet/master/LICENSE.txt")
            };
 

diff --git a/external/spectre.console b/external/spectre.console
diff --git a/nuke-common.sln b/nuke-common.sln
@@ -32,6 +32,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuke.SourceGenerators", "so
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuke.SourceGenerators.Tests", "source\Nuke.SourceGenerators.Tests\Nuke.SourceGenerators.Tests.csproj", "{82D47ABA-67B8-423D-97A7-979858FAAD43}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spectre.Console", "external\spectre.console\src\Spectre.Console\Spectre.Console.csproj", "{63651191-98F4-4AC0-8F45-D12F19431509}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -80,6 +82,10 @@ Global
 		{82D47ABA-67B8-423D-97A7-979858FAAD43}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{82D47ABA-67B8-423D-97A7-979858FAAD43}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{82D47ABA-67B8-423D-97A7-979858FAAD43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63651191-98F4-4AC0-8F45-D12F19431509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63651191-98F4-4AC0-8F45-D12F19431509}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63651191-98F4-4AC0-8F45-D12F19431509}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63651191-98F4-4AC0-8F45-D12F19431509}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/source/Nuke.SourceGenerators.Tests/StronglyTypedSolutionGeneratorTest.Test.verified.cs b/source/Nuke.SourceGenerators.Tests/StronglyTypedSolutionGeneratorTest.Test.verified.cs
@@ -15,6 +15,7 @@ internal class Solution : Nuke.Common.ProjectModel.Solution
     public Project Nuke_Components => SolutionFolder.GetProject("Nuke.Components");
     public Project Nuke_SourceGenerators => SolutionFolder.GetProject("Nuke.SourceGenerators");
     public Project Nuke_SourceGenerators_Tests => SolutionFolder.GetProject("Nuke.SourceGenerators.Tests");
+    public Project Spectre_Console => SolutionFolder.GetProject("Spectre.Console");
     public _misc misc => new(SolutionFolder.GetSolutionFolder("misc"));
     internal class _misc
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ image: mcr.microsoft.com/dotnet/sdk:5.0 @@
     variables:
       GIT_DEPTH: 0
+      GIT_SUBMODULE_STRATEGY: recursive
     stages:
       - build
@@ Expand Down @@