CI fixes

MonoGame · Oct 27, 2023 · d11b80f · d11b80f
1 parent 1e158cf
commit d11b80f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Restore dotnet tools
         run: dotnet tool restore
       - name: Run CAKE
-        run: dotnet cake
+        run: dotnet run --project ./build/Build.csproj
       - name: Package artifacts
         uses: actions/upload-artifact@main
         with:
@@ -71,10 +71,8 @@ jobs:
         with:
           name: SDL-ubuntu-20.04
           path: artifacts-linux-x64
-      - name: Restore dotnet tools
-        run: dotnet tool restore
       - name: Run CAKE
-        run: dotnet cake --target Package
+        run: dotnet run --project ./build/Build.csproj -- "--target=Package"
       - name: Push packages
         run: dotnet nuget push bin/Release/*.nupkg --source https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json --api-key ${GITHUB_TOKEN}
         env:

diff --git a/build/PackageTask.cs b/build/PackageTask.cs
@@ -4,8 +4,6 @@ namespace BuildScripts;
 [TaskName("Package")]
 public sealed class PackageTask : FrostingTask<BuildContext>
 {
-    public override bool ShouldRun(BuildContext context) => context.IsRunningOnLinux();
-
     public override void Run(BuildContext context)
     {
         var sdlMajor = context.FindRegexMatchGroupInFile("sdl/include/SDL_version.h", @"#define SDL_MAJOR_VERSION +(?<ver>\d+)", 1, System.Text.RegularExpressions.RegexOptions.Singleline);