Add test step to build script

Kaioru · Dec 11, 2024 · 1d9a709 · 1d9a709
1 parent b34d794
commit 1d9a709
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,5 +31,5 @@ jobs:
             .nuke/temp
             ~/.nuget/packages
           key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
-      - name: 'Run: Compile'
-        run: ./build.cmd Compile
+      - name: 'Run: Compile, Test'
+        run: ./build.cmd Compile Test
diff --git a/build/Build.CI.GithubActions.cs b/build/Build.CI.GithubActions.cs
@@ -4,20 +4,6 @@
     "build",
     GitHubActionsImage.WindowsLatest,
     On = new[] { GitHubActionsTrigger.Push },
-    InvokedTargets = new[] { nameof(Compile) }
-)]
-[GitHubActions(
-    "pack",
-    GitHubActionsImage.WindowsLatest,
-    On = new[] { GitHubActionsTrigger.WorkflowDispatch },
-    InvokedTargets = new[] { nameof(Pack) },
-    FetchDepth = 0
-)]
-[GitHubActions(
-    "publish",
-    GitHubActionsImage.WindowsLatest,
-    On = new[] { GitHubActionsTrigger.WorkflowDispatch },
-    InvokedTargets = new[] { nameof(Publish) },
-    FetchDepth = 0
+    InvokedTargets = new[] { nameof(Compile), nameof(Test) }
 )]
 partial class Build;
diff --git a/build/Build.cs b/build/Build.cs
@@ -32,12 +32,13 @@ partial class Build : NukeBuild
     Target Restore => d => d
         .Executes(() => DotNetTasks.DotNetRestore());
 
-    Target Test => d => d
-        .Executes(() => DotNetTasks.DotNetTest());
-
     Target Compile => d => d
         .DependsOn(Restore)
         .Executes(() => DotNetTasks
             .DotNetBuild(s => s
             .SetConfiguration(Configuration)));
+
+    Target Test => d => d
+        .After(Compile)
+        .Executes(() => DotNetTasks.DotNetTest());
 }
diff --git a/build/_build.csproj b/build/_build.csproj
@@ -24,4 +24,9 @@
     <Folder Include="ci\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="..\.github\workflows\pack.yml" />
+    <None Remove="..\.github\workflows\publish.yml" />
+  </ItemGroup>
+
 </Project>
diff --git a/test/Edelstein.Common.Database.Tests/Edelstein.Common.Database.Tests.csproj b/test/Edelstein.Common.Database.Tests/Edelstein.Common.Database.Tests.csproj
@@ -4,6 +4,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="EntityFrameworkCore.Exceptions.Sqlite" Version="8.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0-preview.7.24405.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
   </ItemGroup>
 </Project>
diff --git a/test/Edelstein.Common.Services.Auth.Tests/Edelstein.Common.Services.Auth.Tests.csproj b/test/Edelstein.Common.Services.Auth.Tests/Edelstein.Common.Services.Auth.Tests.csproj
@@ -5,7 +5,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="EntityFrameworkCore.Exceptions.Sqlite" Version="8.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0-rc.1.24451.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0-preview.7.24405.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
   </ItemGroup>
 </Project>