From 5ad2e42c6fd3aa8dfcb5d6e82bf6ae60bf5dfce6 Mon Sep 17 00:00:00 2001
From: Andrew Lock <andrewlock.net@gmail.com>
Date: Mon, 30 Sep 2024 22:27:44 +0100
Subject: [PATCH] fix build (#146)

* fix build

* Fix macos build
---
 .github/workflows/BuildAndPack.yml | 16 ++++++++--------
 build/Build.cs                     | 13 -------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/BuildAndPack.yml b/.github/workflows/BuildAndPack.yml
index 60e5a5e3e..6faa42386 100644
--- a/.github/workflows/BuildAndPack.yml
+++ b/.github/workflows/BuildAndPack.yml
@@ -55,9 +55,9 @@ jobs:
           GithubToken: ${{ secrets.GITHUB_TOKEN }}
           NuGetToken: ${{ secrets.NUGET_TOKEN }}
           MSBuildEnableWorkloadResolver: false
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-linux
           path: artifacts
   windows-latest:
     name: windows-latest
@@ -86,13 +86,13 @@ jobs:
           GithubToken: ${{ secrets.GITHUB_TOKEN }}
           NuGetToken: ${{ secrets.NUGET_TOKEN }}
           MSBuildEnableWorkloadResolver: false
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-windows
           path: artifacts
   macOS-latest:
-    name: macOS-latest
-    runs-on: macOS-latest
+    name: macos-13 # latest is arm64, and it breaks a bunch of stuff
+    runs-on: macos-13 # latest is arm64, and it breaks a bunch of stuff
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3
@@ -117,7 +117,7 @@ jobs:
           GithubToken: ${{ secrets.GITHUB_TOKEN }}
           NuGetToken: ${{ secrets.NUGET_TOKEN }}
           MSBuildEnableWorkloadResolver: false
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-macos
           path: artifacts
diff --git a/build/Build.cs b/build/Build.cs
index 39bb2c919..1d1699ff8 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -12,20 +12,7 @@
 using static Nuke.Common.IO.PathConstruction;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 
-[CheckBuildProjectConfigurations]
 [ShutdownDotNetAfterServerBuild]
-[GitHubActions("BuildAndPack",
-    GitHubActionsImage.UbuntuLatest,
-    GitHubActionsImage.WindowsLatest,
-    GitHubActionsImage.MacOsLatest,
-    ImportGitHubTokenAs = nameof(GithubToken),
-    OnPushTags = new [] {"*"},
-    OnPushBranches = new[] {"master", "main"},
-    OnPullRequestBranches = new[] {"*"},
-    AutoGenerate = false,
-    ImportSecrets = new[] {nameof(NuGetToken)},
-    InvokedTargets = new[] {nameof(Clean), nameof(Test), nameof(TestPackages), nameof(PushToNuGet)}
-)]
 class Build : NukeBuild
 {
     /// Support plugins are available for: