Skip to content

Commit

Permalink
fix build (#146)
Browse files Browse the repository at this point in the history
* fix build

* Fix macos build
  • Loading branch information
andrewlock committed Sep 30, 2024
1 parent e5df78d commit 5ad2e42
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 21 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/BuildAndPack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
13 changes: 0 additions & 13 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 5ad2e42

Please sign in to comment.